commit a747d5e47bef27acd18afda3ed43309ad5fab87b
author Narayan Kamath <narayan@google.com> Thu Jan 15 11:53:31 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 15 11:53:32 2015 +0000
tree 92f4186d8fe1a0f10ad0451e1505b8609280f079
parent aa7a646eebb9b22d1421f8b09a09669bdb10d8b7
parent 7dc8d32fd2fae16c6b1c95a49c864c2041a7a72c

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

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

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 @@
             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 @@
         Configuration ci;
         synchronized(this) {
             ci = new Configuration(mConfiguration);
+            ci.userSetLocale = false;
         }
         return ci;
     }