diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-09-03 22:55:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-03 22:55:41 +0000 |
| commit | 2fd7cc5ba593c47cb9028faced8fa64905a16121 (patch) | |
| tree | 272380a82b703939ee472a6ef6da5b4d896de708 /core/java | |
| parent | c0c140a1368a08dca3a834d175ea1825d3fb567b (diff) | |
| parent | b1a4bf2c4be73c72d2628b6087cf7b256376122a (diff) | |
Merge "Ignore empty locale list when diffing Configuration objects"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/res/Configuration.java | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |