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

2015-01-15 11:53:31 +00:00
parent aa7a646eeb 7dc8d32fd2
commit a747d5e47b
1 changed files with 2 additions and 1 deletions
--- 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;
    }