Clear locales without changing layout direction.
Calling Configuration.setLocales with emtpy LocaleList may change the
layout direction to LTR. To clear the locales in Configuration without
layout direction change, introduce hidden API to Configuration.
Bug: 28695661
Change-Id: I47c339dffb83099bd329ddb60237dab27b05f593
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 8cc165d..d63fbb1 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2241,7 +2241,7 @@
public static void clearConfiguration(Configuration inoutConfig) {
inoutConfig.fontScale = 0;
if (!inoutConfig.userSetLocale && !inoutConfig.getLocales().isEmpty()) {
- inoutConfig.setLocales(LocaleList.getEmptyLocaleList());
+ inoutConfig.clearLocales();
}
}