commit 2fd7cc5ba593c47cb9028faced8fa64905a16121
author Wale Ogunwale <ogunwale@google.com> Thu Sep 03 22:55:41 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 03 22:55:41 2015 +0000
tree 272380a82b703939ee472a6ef6da5b4d896de708
parent c0c140a1368a08dca3a834d175ea1825d3fb567b
parent b1a4bf2c4be73c72d2628b6087cf7b256376122a

Merge "Ignore empty locale list when diffing Configuration objects"

core/java/android/content/res/Configuration.java

diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java
index 3ecbaa0..927c02f 100644
--- a/core/java/android/content/res/Configuration.java
+++ b/core/java/android/content/res/Configuration.java
@@ -1049,7 +1049,7 @@
         }
         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;
         }