From b1a4bf2c4be73c72d2628b6087cf7b256376122a Mon Sep 17 00:00:00 2001
From: Wale Ogunwale <ogunwale@google.com>
Date: Thu, 3 Sep 2015 15:08:51 -0700
Subject: Ignore empty locale list when diffing Configuration objects

b46fdd4 introduced the concept of locale list to Configuration objects.
However, the change alway returned a locale difference when the delta
object locale list is set to the defualt (empty). We now don't return
a difference if the delta object as an empty locale list which is
consistent with what we did before the change and in line with how we
diff other configuration fields.

Bug: 23744091
Change-Id: I8c2c39d9a7e91e6a3a283312b745c4fdf6874396
---
 core/java/android/content/res/Configuration.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/java')

diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java
index 3ecbaa05a4f1..927c02f9ecfd 100644
--- a/core/java/android/content/res/Configuration.java
+++ b/core/java/android/content/res/Configuration.java
@@ -1049,7 +1049,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration
         }
         fixUpLocaleList();
         delta.fixUpLocaleList();
-        if (!mLocaleList.equals(delta.mLocaleList)) {
+        if (!delta.mLocaleList.isEmpty() && !mLocaleList.equals(delta.mLocaleList)) {
             changed |= ActivityInfo.CONFIG_LOCALE;
             changed |= ActivityInfo.CONFIG_LAYOUT_DIRECTION;
         }
-- 
cgit v1.2.3