| commit | 1178705e53955ca64551fd0ce02018653d031a03 | [log] [tgz] |
|---|---|---|
| author | Riddle Hsu <riddlehsu@google.com> | Tue Oct 25 14:18:11 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 25 14:18:11 2022 +0000 |
| tree | 6d93255122a285fc297bdbcca9a78e930213b6a0 | |
| parent | bcae5b2822bd24494c94d1d78febf47bbda841f0 [diff] | |
| parent | ada9d7accb638b540b978718034ad0e8a0c4e35f [diff] |
Merge "Only set locale in config for updating locale" into tm-qpr-dev am: b553c74619 am: ada9d7accb Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20235235 Change-Id: I88c62a628a57f8f39bd5d9b849372e0f74e0e430 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 be53a62..0e2b098 100644 --- a/core/java/android/app/LocaleManager.java +++ b/core/java/android/app/LocaleManager.java
@@ -174,7 +174,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 999be08..65372be 100644 --- a/core/java/com/android/internal/app/LocalePicker.java +++ b/core/java/com/android/internal/app/LocalePicker.java
@@ -314,8 +314,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;