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

Commit a747d5e4 authored by Narayan Kamath's avatar Narayan Kamath Committed by Gerrit Code Review
Browse files

Merge "Fix unexpected language changes on SIM card insertion."

parents aa7a646e 7dc8d32f

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

+2 −1
Original line number Diff line number Diff line
@@ -2303,7 +2303,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
            ConfigurationInfo.GL_ES_VERSION_UNDEFINED);















        mConfiguration.setToDefaults();













        mConfiguration.setLocale(Locale.getDefault());













        mConfiguration.locale = Locale.getDefault();





























        mConfigurationSeq = mConfiguration.seq = 1;















        mProcessCpuTracker.init();










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













        Configuration ci;















        synchronized(this) {















            ci = new Configuration(mConfiguration);













            ci.userSetLocale = false;















        }















        return ci;















    }