commit eb62f7f3e4db327366774d5527c56f215a7c9281
author Roozbeh Pournader <roozbeh@google.com> Thu Mar 17 15:46:06 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 17 15:46:08 2016 +0000
tree 5b7cded8eed4875b34f7d04897c566b1295cbfca
parent 610bcf378197df173d19fa7b9c0461976622f947
parent d403151f3df7c23f516f54566b59ef5f7697b64b

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

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 049d585..5fc2899 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2093,7 +2093,7 @@
          */
         public static void clearConfiguration(Configuration inoutConfig) {
             inoutConfig.fontScale = 0;
-            if (!inoutConfig.userSetLocale) {
+            if (!inoutConfig.userSetLocale && !inoutConfig.getLocales().isEmpty()) {
                 inoutConfig.setLocales(LocaleList.getEmptyLocaleList());
             }
         }