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

Commit 4a7b0062 authored by Justin Harrison's avatar Justin Harrison Committed by android-build-merger
Browse files

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

automerge: 561cf959

* commit '561cf959':
  Fix unexpected language changes on SIM card insertion.
parents e5a25a76 561cf959

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

+2 −1
Original line number Diff line number Diff line
@@ -2096,7 +2096,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();










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













        Configuration ci;















        synchronized(this) {















            ci = new Configuration(mConfiguration);













            ci.userSetLocale = false;















        }















        return ci;















    }