commit 2f77f9c03e016f6d453c1fa799c9f68c30acf0dd
author Daniel 2 Olofsson <daniel2.olofsson@sonymobile.com> Mon Jun 10 14:49:14 2013 +0200
committer Henrik Baard <henrik.baard@sonymobile.com> Fri Jul 12 09:06:57 2013 +0200
tree a4be7d9bccaaa218778b1013b3b03e3bcb89ccd0
parent fa42e774bc48c3172023c8c49610baa469c19e39

Fixed race condition in Spinner.DialogPopup on null reference.

NullPointerException is triggered when DialogPopup is
dismissed due to object mPopup being null when not showing.
Race condition is triggered when dialog is dismissed before
touch event to dismiss dialog has been processed properly.

Fixed by adding a null check prior to accessing mPopup object.

Change-Id: I3c4fe9c279d92a7103fb4f68189d1d42beedc606

core/java/android/widget/Spinner.java

diff --git a/core/java/android/widget/Spinner.java b/core/java/android/widget/Spinner.java
index 925864c..b914d8b 100644
--- a/core/java/android/widget/Spinner.java
+++ b/core/java/android/widget/Spinner.java
@@ -837,8 +837,10 @@
         private CharSequence mPrompt;
 
         public void dismiss() {
-            mPopup.dismiss();
-            mPopup = null;
+            if (mPopup != null) {
+                mPopup.dismiss();
+                mPopup = null;
+            }
         }
 
         public boolean isShowing() {