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

Commit 74204892 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Gerrit Code Review
Browse files

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

parents 372fa2ed 5fe382e3

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 -> {