Merge "Stop layout reset by setting empty locale list." into nyc-dev

2016-03-17 15:46:06 +00:00
parent 610bcf3781 d403151f3d
commit eb62f7f3e4
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2093,7 +2093,7 @@ public final class Settings {
         */
        public static void clearConfiguration(Configuration inoutConfig) {
            inoutConfig.fontScale = 0;
-            if (!inoutConfig.userSetLocale) {
+            if (!inoutConfig.userSetLocale && !inoutConfig.getLocales().isEmpty()) {
                inoutConfig.setLocales(LocaleList.getEmptyLocaleList());
            }
        }