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

Commit e729c826 authored by Betty Chang's avatar Betty Chang Committed by android-build-merger
Browse files

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

am: 538afed3

Change-Id: I81f96c06c69719c55ca2bba384e13e5631517c70
parents 4e74432e 538afed3

src/java/com/android/internal/telephony/cat/CatService.java

+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");

    }