Merge "Null locale causing the VTS fail." am: 179f30a443

am: 9568191633 Change-Id: Iab284dfc831a9079e339c8c23fba8f3e7e4ec04d
2019-01-06 20:44:13 -08:00
parent 36f0d9b96a 9568191633
commit e9fe937245
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/view/AccessibilityIterators.java
+++ b/core/java/android/view/AccessibilityIterators.java
@@ -147,6 +147,9 @@ public final class AccessibilityIterators {
        @Override
        public void onConfigurationChanged(Configuration globalConfig) {
            final Locale locale = globalConfig.getLocales().get(0);
+            if (locale == null) {
+                return;
+            }
            if (!mLocale.equals(locale)) {
                mLocale = locale;
                onLocaleChanged(locale);