commit 5a34193a54d1ba56a478489acfad19414f358657
author Sudheer Shanka <sudheersai@google.com> Tue Nov 27 23:26:29 2018 -0800
committer android-build-merger <android-build-merger@google.com> Tue Nov 27 23:26:29 2018 -0800
tree 864a50d77a80f93149d1e081fff3e5ca2f39d250
parent fd7b5bf6d4fa6a85cf6ad79df8cd143e0e81f9d4
parent 742048924f6b01658729f94c740f32cdd536dacf

Merge "Fix ShortcutService handling of locale change during device setup."
am: 742048924f

Change-Id: I091a439fd5adc8bd3693af25bcef781bcaf7e2f6

services/core/java/com/android/server/pm/ShortcutUser.java

diff --git a/services/core/java/com/android/server/pm/ShortcutUser.java b/services/core/java/com/android/server/pm/ShortcutUser.java
index 505e4ee..1fd9b69 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 @@
      */
     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 -> {