Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e367f398 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by android-build-merger
Browse files

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

am: 5a34193a

Change-Id: I28ebbab625d12faeea4c3a9676dd73fc9f092b20
parents d2f716b7 5a34193a

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

+3 −2
Original line number Diff line number Diff line
@@ -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 -> {