Merge "Null locale causing the VTS fail."

2019-01-07 04:19:22 +00:00
parent 7ec9e6849e b99c60c36e
commit 179f30a443
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);