Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a747d5e4: Merge "Fix unexpected language changes on SIM card insertion."

Browse Source 
* commit 'a747d5e47bef27acd18afda3ed43309ad5fab87b':
  Fix unexpected language changes on SIM card insertion.
This commit is contained in:
Narayan Kamath
2015-01-15 12:02:15 +00:00
committed by Android Git Automerger
parent 3d64a8508a a747d5e47b
commit 2f7ae52809
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -2303,7 +2303,7 @@ public final class ActivityManagerService extends ActivityManagerNative
ConfigurationInfo.GL_ES_VERSION_UNDEFINED); ConfigurationInfo.GL_ES_VERSION_UNDEFINED);
mConfiguration.setToDefaults(); mConfiguration.setToDefaults();
mConfiguration.setLocale(Locale.getDefault()); mConfiguration.locale = Locale.getDefault();
mConfigurationSeq = mConfiguration.seq = 1; mConfigurationSeq = mConfiguration.seq = 1;
mProcessCpuTracker.init(); mProcessCpuTracker.init();
@@ -16197,6 +16197,7 @@ public final class ActivityManagerService extends ActivityManagerNative
Configuration ci; Configuration ci;
synchronized(this) { synchronized(this) {
ci = new Configuration(mConfiguration); ci = new Configuration(mConfiguration);
ci.userSetLocale = false;
} }
return ci; return ci;
} }