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

Commit 95681916 authored by Manpreet's avatar Manpreet Committed by android-build-merger
Browse files

Merge "Null locale causing the VTS fail." 

am: 179f30a4

Change-Id: I8ae92392e70c046194df1c8ebee0bd32ed9513cf
parents 57d3db12 179f30a4

core/java/android/view/AccessibilityIterators.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -147,6 +147,9 @@ public final class AccessibilityIterators { 
        @Override

        @Override

        public void onConfigurationChanged(Configuration globalConfig) {

        public void onConfigurationChanged(Configuration globalConfig) {

            final Locale locale = globalConfig.getLocales().get(0);

            final Locale locale = globalConfig.getLocales().get(0);

            if (locale == null) {

                return;

            }

            if (!mLocale.equals(locale)) {

            if (!mLocale.equals(locale)) {

                mLocale = locale;

                mLocale = locale;

                onLocaleChanged(locale);

                onLocaleChanged(locale);