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

Commit 9bc94121 authored by Betty Chang's avatar Betty Chang Committed by Android (Google) Code Review
Browse files

Merge "[Telephony MainLine] To use ActivityManager.setDeviceLocales to replace Configuration"

parents a479344f bb6fd876
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static com.android.internal.telephony.cat.CatCmdMessage.SetupEventListCon
import static com.android.internal.telephony.cat.CatCmdMessage.SetupEventListConstants.USER_ACTIVITY_EVENT;

import android.annotation.UnsupportedAppUsage;
import android.app.ActivityManager;
import android.app.ActivityManagerNative;
import android.app.IActivityManager;
import android.app.backup.BackupManager;
@@ -1182,8 +1183,7 @@ public class CatService extends Handler implements AppInterface {
        for (int i = 0; i < defaultLocaleList.size(); i++) {
            locales[i+1] = defaultLocaleList.get(i);
        }
        config.setLocales(new LocaleList(locales));
        config.userSetLocale = true;
        mContext.getSystemService(ActivityManager.class).setDeviceLocales(new LocaleList(locales));
        am.updatePersistentConfiguration(config);
        BackupManager.dataChanged("com.android.providers.settings");
    }