commit d14ed44c52a9a813c0249b2733dd865ef9415ce9
author Jack Yu <jackyu@google.com> Mon Jan 07 06:37:30 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 07 06:37:30 2019 +0000
tree 4e6d2269e5008694b978e5533d9158b0bbf6dbfa
parent 179f30a4433ae17ea409fbafb203b9fdef717b5e
parent 239aa0ae0ab6781ff572e0665e4e37f8f4a65571

Merge "Cleaned up dead code"

core/java/android/view/AccessibilityIterators.java

diff --git a/core/java/android/view/AccessibilityIterators.java b/core/java/android/view/AccessibilityIterators.java
index 9f7560c..54cfc00 100644
--- a/core/java/android/view/AccessibilityIterators.java
+++ b/core/java/android/view/AccessibilityIterators.java
@@ -147,6 +147,9 @@
         @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);