commit 93509ccdaa3a5e1ec2f2f0288a93d183f82a03fa
author Jeremy Meyer <jakmcbane@google.com> Tue Feb 18 14:56:39 2025 -0800
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Mar 22 10:13:20 2025 -0700
tree 0c17ec83da39f2ee771fc7abbd98bb11e510c7c0
parent 6b552f6fc4a55c9533302583ad2d2c6cba66ed14

set default locale when config change isn't locale

Test: Automated
Bug: 392255526
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:27456ecfedf429f944a54419efcede6224e1ab7d)
Merged-In: I30f9e3a876570d353849bb54d6509672cb4eac64
Change-Id: I30f9e3a876570d353849bb54d6509672cb4eac64

core/java/android/content/res/ResourcesImpl.java

diff --git a/core/java/android/content/res/ResourcesImpl.java b/core/java/android/content/res/ResourcesImpl.java
index 104a8d1..0fb267e 100644
--- a/core/java/android/content/res/ResourcesImpl.java
+++ b/core/java/android/content/res/ResourcesImpl.java
@@ -529,6 +529,7 @@
                         for (int i = 0; i < locales.size(); i++) {
                             selectedLocales[i] = adjustLanguageTag(locales.get(i).toLanguageTag());
                         }
+                        defaultLocale = adjustLanguageTag(lc.getDefaultLocale().toLanguageTag());
                     } else {
                         selectedLocales = new String[]{
                                 adjustLanguageTag(locales.get(0).toLanguageTag())};