commit f937313944e0e9dfa4375a275710e420c2a92554
author Mindy Pereira <mindyp@google.com> Mon Apr 16 08:58:53 2012 -0700
committer Mindy Pereira <mindyp@google.com> Mon Apr 16 08:58:53 2012 -0700
tree 88502f60f53ccf68a80f6eb6a7611494f2ad3ade
parent 32f038deabc516cb9e1420eee300a581c5692460

Perform null check on empty view before doing accessibility check.

Fixes b/6341858 AdapterView does not properly check for null before checking empty view accessibility info

Change-Id: Ia19fdef2c7c5f3e6c3053ebc754efe6a664f9d66

core/java/android/widget/AdapterView.java

diff --git a/core/java/android/widget/AdapterView.java b/core/java/android/widget/AdapterView.java
index 1a2231e..abfc577 100644
--- a/core/java/android/widget/AdapterView.java
+++ b/core/java/android/widget/AdapterView.java
@@ -650,7 +650,8 @@
         mEmptyView = emptyView;
 
         // If not explicitly specified this view is important for accessibility.
-        if (emptyView.getImportantForAccessibility() == IMPORTANT_FOR_ACCESSIBILITY_AUTO) {
+        if (emptyView != null
+                && emptyView.getImportantForAccessibility() == IMPORTANT_FOR_ACCESSIBILITY_AUTO) {
             emptyView.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_YES);
         }