| commit | ada9d7accb638b540b978718034ad0e8a0c4e35f | [log] [tgz] |
|---|---|---|
| author | Riddle Hsu <riddlehsu@google.com> | Tue Oct 25 13:40:11 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 25 13:40:11 2022 +0000 |
| tree | e924f6b3544f969afb6bced86de1469a70caab56 | |
| parent | ebe2684f2d5772e5d0179106378b067b5e52138a [diff] | |
| parent | b553c746197a05cd9d680fe8c37ca5a0f4c85b4c [diff] |
Merge "Only set locale in config for updating locale" into tm-qpr-dev am: b553c74619 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20235235 Change-Id: I1cb0b923aa4673e4d04abbf65f143d142cdb0ac5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/java/android/app/LocaleManager.java b/core/java/android/app/LocaleManager.java index 794c694..c5dedb3 100644 --- a/core/java/android/app/LocaleManager.java +++ b/core/java/android/app/LocaleManager.java
@@ -173,7 +173,7 @@ @TestApi public void setSystemLocales(@NonNull LocaleList locales) { try { - Configuration conf = ActivityManager.getService().getConfiguration(); + Configuration conf = new Configuration(); conf.setLocales(locales); ActivityManager.getService().updatePersistentConfiguration(conf); } catch (RemoteException e) {
diff --git a/core/java/com/android/internal/app/LocalePicker.java b/core/java/com/android/internal/app/LocalePicker.java index 3c53d07..7dd1d26 100644 --- a/core/java/com/android/internal/app/LocalePicker.java +++ b/core/java/com/android/internal/app/LocalePicker.java
@@ -311,8 +311,7 @@ try { final IActivityManager am = ActivityManager.getService(); - final Configuration config = am.getConfiguration(); - + final Configuration config = new Configuration(); config.setLocales(locales); config.userSetLocale = true;
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java index 808ea9e..6d375ac 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
@@ -549,7 +549,7 @@ try { IActivityManager am = ActivityManager.getService(); - Configuration config = am.getConfiguration(); + final Configuration config = new Configuration(); config.setLocales(merged); // indicate this isn't some passing default - the user wants this remembered config.userSetLocale = true;