Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ignore empty locale list when diffing Configuration objects"

Browse Source
This commit is contained in:
Wale Ogunwale
2015-09-03 22:55:41 +00:00
committed by Android (Google) Code Review
parent c0c140a136 b1a4bf2c4b
commit 2fd7cc5ba5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/res/Configuration.java
View File

@@ -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;
}