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

am: 0c2f681bdf

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

Change-Id: I9913e7466450a83bd5872abc62cfaac3d235d8d8

core/java/android/app/ActivityThread.java

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