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

Commit 0c2f681b 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: fbf3a096

am: fbdf46f6

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

Change-Id: I99bb920efcc7befa2817bed3a7fb7a0bcad4a13e
parents a96bd319 fbdf46f6
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) {