Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b553c746 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

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

parents 1e706ca9 03f0f57e

core/java/android/app/LocaleManager.java

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ public class LocaleManager { 
    @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) {

core/java/com/android/internal/app/LocalePicker.java

+1 −2
Original line number Diff line number Diff line
@@ -311,8 +311,7 @@ public class LocalePicker extends ListFragment { 


        try {

            final IActivityManager am = ActivityManager.getService();

            final Configuration config = am.getConfiguration();



            final Configuration config = new Configuration();

            config.setLocales(locales);

            config.userSetLocale = true;

packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ public class SettingsHelper { 


        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;