Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fd7cc5b authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Ignore empty locale list when diffing Configuration objects"

parents c0c140a1 b1a4bf2c

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

        }