diff options
| author | Narayan Kamath <narayan@google.com> | 2015-01-15 11:53:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-15 11:53:32 +0000 |
| commit | a747d5e47bef27acd18afda3ed43309ad5fab87b (patch) | |
| tree | 92f4186d8fe1a0f10ad0451e1505b8609280f079 | |
| parent | aa7a646eebb9b22d1421f8b09a09669bdb10d8b7 (diff) | |
| parent | 7dc8d32fd2fae16c6b1c95a49c864c2041a7a72c (diff) | |
| download | frameworks_base-a747d5e47bef27acd18afda3ed43309ad5fab87b.zip frameworks_base-a747d5e47bef27acd18afda3ed43309ad5fab87b.tar.gz frameworks_base-a747d5e47bef27acd18afda3ed43309ad5fab87b.tar.bz2 | |
Merge "Fix unexpected language changes on SIM card insertion."
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 138bedc..3cc27f4 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -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; } |