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

Commit 1168548d authored by Roozbeh Pournader's avatar Roozbeh Pournader Committed by Android (Google) Code Review
Browse files

Merge "Fix null locale edge cases in Configuration and Resources"

parents d427047d 8a412e0b

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

+1 −3
Original line number Diff line number Diff line
@@ -724,9 +724,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration 
        fontScale = o.fontScale;

        mcc = o.mcc;

        mnc = o.mnc;

        if (o.locale != null) {

            locale = (Locale) o.locale.clone();

        }

        locale = o.locale == null ? null : (Locale) o.locale.clone();

        o.fixUpLocaleList();

        mLocaleList = o.mLocaleList;

        userSetLocale = o.userSetLocale;

core/java/android/content/res/Resources.java

+1 −1
Original line number Diff line number Diff line
@@ -1988,7 +1988,7 @@ public class Resources { 
        }

        synchronized (sSync) {

            if (mPluralRule != null) {

                mPluralRule = PluralRules.forLocale(config.getLocales().getPrimary());

                mPluralRule = PluralRules.forLocale(mConfiguration.getLocales().getPrimary());

            }

        }

    }