diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 049d585d26514..5fc2899877f49 100755 --- 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()); } }