Merge "Perform null check on empty view before doing accessibility check."

Mindy Pereira · Android (Google) Code Review · commit 7c886acf2e60 · 2012-04-16T09:45:29.000-07:00
diff --git a/core/java/android/widget/AdapterView.java b/core/java/android/widget/AdapterView.java
@@ -650,7 +650,8 @@ public void setEmptyView(View emptyView) {
         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);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -650,7 +650,8 @@ public void setEmptyView(View emptyView) {`
`650`	`650`	`mEmptyView = emptyView;`
`651`	`651`
`652`	`652`	`// If not explicitly specified this view is important for accessibility.`
`653`		`- if (emptyView.getImportantForAccessibility() == IMPORTANT_FOR_ACCESSIBILITY_AUTO) {`
	`653`	`+ if (emptyView != null`
	`654`	`+ && emptyView.getImportantForAccessibility() == IMPORTANT_FOR_ACCESSIBILITY_AUTO) {`
`654`	`655`	`emptyView.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_YES);`
`655`	`656`	`}`
`656`	`657`