diff options
| author | 2018-11-27 23:46:16 -0800 | |
|---|---|---|
| committer | 2018-11-27 23:46:16 -0800 | |
| commit | b9958f1e4269d5d439f21e7ee13b35f4ce27c93a (patch) | |
| tree | ab2ec1ba3b71ef74638fe4638ea2712110ac3c0c | |
| parent | ea2cc7261071db894d97ba470423fe1bfc4f7188 (diff) | |
| parent | e367f398b8b09c7bd147497cdce3ab7122af3f1b (diff) | |
Merge "Fix ShortcutService handling of locale change during device setup." am: 742048924f am: 5a34193a54
am: e367f398b8
Change-Id: I5573733392e04c8f0bee1f170b6b8b760e088235
| -rw-r--r-- | services/core/java/com/android/server/pm/ShortcutUser.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/ShortcutUser.java b/services/core/java/com/android/server/pm/ShortcutUser.java index 505e4ee60529..1fd9b69e521d 100644 --- a/services/core/java/com/android/server/pm/ShortcutUser.java +++ b/services/core/java/com/android/server/pm/ShortcutUser.java @@ -294,13 +294,14 @@ class ShortcutUser { */ public void detectLocaleChange() { final String currentLocales = mService.injectGetLocaleTagsForUser(mUserId); - if (getKnownLocales().equals(currentLocales)) { + if (!TextUtils.isEmpty(mKnownLocales) && mKnownLocales.equals(currentLocales)) { return; } if (ShortcutService.DEBUG) { - Slog.d(TAG, "Locale changed from " + currentLocales + " to " + mKnownLocales + Slog.d(TAG, "Locale changed from " + mKnownLocales + " to " + currentLocales + " for user " + mUserId); } + mKnownLocales = currentLocales; forAllPackages(pkg -> { |