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

Commit ade0bce3 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

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

Change-Id: I980061c2e818a746eb46e64a88887be8566ad618
parents 528a5bd4 fbf3a096

core/java/android/app/ActivityThread.java

+5 −2
Original line number Diff line number Diff line
@@ -5007,8 +5007,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) {