Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only set locale in config for updating locale" into tm-qpr-dev am: b553c74619

Browse Source 
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>
This commit is contained in:
Riddle Hsu
2022-10-25 13:40:11 +00:00
committed by Automerger Merge Worker
parent ebe2684f2d b553c74619
commit ada9d7accb
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/LocaleManager.java
View File

@@ -173,7 +173,7 @@ public class LocaleManager {
@TestApi @TestApi
public void setSystemLocales(@NonNull LocaleList locales) { public void setSystemLocales(@NonNull LocaleList locales) {
try { try {
Configuration conf = ActivityManager.getService().getConfiguration(); Configuration conf = new Configuration();
conf.setLocales(locales); conf.setLocales(locales);
ActivityManager.getService().updatePersistentConfiguration(conf); ActivityManager.getService().updatePersistentConfiguration(conf);
} catch (RemoteException e) { } catch (RemoteException e) {

3
core/java/com/android/internal/app/LocalePicker.java
View File

@@ -311,8 +311,7 @@ public class LocalePicker extends ListFragment {
try { try {
final IActivityManager am = ActivityManager.getService(); final IActivityManager am = ActivityManager.getService();
final Configuration config = am.getConfiguration(); final Configuration config = new Configuration();
config.setLocales(locales); config.setLocales(locales);
config.userSetLocale = true; config.userSetLocale = true;

2
packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java
View File

@@ -549,7 +549,7 @@ public class SettingsHelper {
try { try {
IActivityManager am = ActivityManager.getService(); IActivityManager am = ActivityManager.getService();
Configuration config = am.getConfiguration(); final Configuration config = new Configuration();
config.setLocales(merged); config.setLocales(merged);
// indicate this isn't some passing default - the user wants this remembered // indicate this isn't some passing default - the user wants this remembered
config.userSetLocale = true; config.userSetLocale = true;