Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 5a34193a54

Change-Id: I28ebbab625d12faeea4c3a9676dd73fc9f092b20
This commit is contained in:
Sudheer Shanka
2018-11-27 23:35:43 -08:00
committed by android-build-merger
parent d2f716b776 5a34193a54
commit e367f398b8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/pm/ShortcutUser.java
View File

@@ -294,13 +294,14 @@ class ShortcutUser {
*/ */
public void detectLocaleChange() { public void detectLocaleChange() {
final String currentLocales = mService.injectGetLocaleTagsForUser(mUserId); final String currentLocales = mService.injectGetLocaleTagsForUser(mUserId);
if (getKnownLocales().equals(currentLocales)) { if (!TextUtils.isEmpty(mKnownLocales) && mKnownLocales.equals(currentLocales)) {
return; return;
} }
if (ShortcutService.DEBUG) { if (ShortcutService.DEBUG) {
Slog.d(TAG, "Locale changed from " + currentLocales + " to " + mKnownLocales Slog.d(TAG, "Locale changed from " + mKnownLocales + " to " + currentLocales
+ " for user " + mUserId); + " for user " + mUserId);
} }
mKnownLocales = currentLocales; mKnownLocales = currentLocales;
forAllPackages(pkg -> { forAllPackages(pkg -> {