From bd5cac67b8b3087c030cb9068e4db8ea19a3d72a Mon Sep 17 00:00:00 2001
From: Seigo Nonaka <nona@google.com>
Date: Fri, 13 May 2016 15:11:37 +0900
Subject: [PATCH] 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
---
 core/java/android/content/res/Configuration.java | 10 ++++++++++
 core/java/android/provider/Settings.java         |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java
index 29e5b5db5b694..c1aac8584acb2 100644
--- a/core/java/android/content/res/Configuration.java
+++ b/core/java/android/content/res/Configuration.java
@@ -1484,6 +1484,16 @@ public final class Configuration implements Parcelable, Comparable<Configuration
         setLocales(loc == null ? LocaleList.getEmptyLocaleList() : new LocaleList(loc));
     }
 
+    /**
+     * @hide
+     *
+     * Clears the locale without changing layout direction.
+     */
+    public void clearLocales() {
+        mLocaleList = LocaleList.getEmptyLocaleList();
+        locale = null;
+    }
+
     /**
      * Return the layout direction. Will be either {@link View#LAYOUT_DIRECTION_LTR} or
      * {@link View#LAYOUT_DIRECTION_RTL}.
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 8cc165d75c2b5..d63fbb1fdafa9 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2241,7 +2241,7 @@ public final class Settings {
         public static void clearConfiguration(Configuration inoutConfig) {
             inoutConfig.fontScale = 0;
             if (!inoutConfig.userSetLocale && !inoutConfig.getLocales().isEmpty()) {
-                inoutConfig.setLocales(LocaleList.getEmptyLocaleList());
+                inoutConfig.clearLocales();
             }
         }