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

Commit 82008858 authored by Justin Harrison's avatar Justin Harrison Committed by Android (Google) Code Review
Browse files

Merge "Fix unexpected language changes on SIM card insertion." into lmp-mr1-dev

parents ad58ca67 c63a16b8

services/core/java/com/android/server/am/ActivityManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -2106,7 +2106,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
        mTrackingAssociations = "1".equals(SystemProperties.get("debug.track-associations"));















        mConfiguration.setToDefaults();













        mConfiguration.setLocale(Locale.getDefault());













        mConfiguration.locale = Locale.getDefault();





























        mConfigurationSeq = mConfiguration.seq = 1;















        mProcessCpuTracker.init();










@@ -16605,6 +16605,7 @@ public final class ActivityManagerService extends ActivityManagerNative













        Configuration ci;















        synchronized(this) {















            ci = new Configuration(mConfiguration);













            ci.userSetLocale = false;















        }















        return ci;















    }