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

Commit e3b16303 authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

Merge "Use app\'s best locale if they override LocaleList" into nyc-dev am:...

Merge "Use app\'s best locale if they override LocaleList" into nyc-dev am: fbf3a096 am: fbdf46f6
am: 0c2f681b

* commit '0c2f681b':
  Use app's best locale if they override LocaleList

Change-Id: I9913e7466450a83bd5872abc62cfaac3d235d8d8
parents 657b3901 0c2f681b
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -5005,8 +5005,11 @@ public final class ActivityThread {
                return;
            }
        }
        throw new AssertionError("chosen locale " + bestLocale + " must be present in LocaleList: "
                + newLocaleList.toLanguageTags());

        // The app may have overridden the LocaleList with its own Locale
        // (not present in the available list). Push the chosen Locale
        // to the front of the list.
        LocaleList.setDefault(new LocaleList(bestLocale, newLocaleList));
    }

    private void handleBindApplication(AppBindData data) {