commit 6b552f6fc4a55c9533302583ad2d2c6cba66ed14
author Jeremy Meyer <jakmcbane@google.com> Fri Feb 14 17:00:39 2025 -0800
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Mar 22 10:12:59 2025 -0700
tree 7af066388f433c8c95648b8266c3193d0b0b21db
parent 57707ea4c67f75dfa5b6b7139d95dc76edcc060f

Add some logging around locale changes

Test: automated
Bug: 392255526
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8419c97dafe54b54a23507e9cdadff4eb07b17f1)
Merged-In: I6f3ee4bddc8d3a4ca32094af4c5d124a1904242a
Change-Id: I6f3ee4bddc8d3a4ca32094af4c5d124a1904242a

core/java/android/content/res/Configuration.java

diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java
index ef200c3..2e09994 100644
--- a/core/java/android/content/res/Configuration.java
+++ b/core/java/android/content/res/Configuration.java
@@ -2358,8 +2358,13 @@
      * @param locales The locale list. If null, an empty LocaleList will be assigned.
      */
     public void setLocales(@Nullable LocaleList locales) {
+        LocaleList oldList = mLocaleList;
         mLocaleList = locales == null ? LocaleList.getEmptyLocaleList() : locales;
         locale = mLocaleList.get(0);
+        if (!mLocaleList.equals(oldList)) {
+            Slog.v(TAG, "Updating configuration, locales updated from " + oldList
+                    + " to " + mLocaleList);
+        }
         setLayoutDirection(locale);
     }
 

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 bcaceb2..104a8d1 100644
--- a/core/java/android/content/res/ResourcesImpl.java
+++ b/core/java/android/content/res/ResourcesImpl.java
@@ -491,6 +491,9 @@
                             }
                             defaultLocale =
                                     adjustLanguageTag(lc.getDefaultLocale().toLanguageTag());
+                            Slog.v(TAG, "Updating configuration, with default locale "
+                                    + defaultLocale + " and selected locales "
+                                    + Arrays.toString(selectedLocales));
                         } else {
                             String[] availableLocales;
                             // The LocaleList has changed. We must query the AssetManager's