commit ca5766cf26c23deb123b10cd362ce2d57a36d21e
author Christopher Tate <ctate@android.com> Mon Jan 27 20:00:21 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 27 20:00:21 2014 +0000
tree c7b0e3e291c414545c5607b9f26465aa8893b877
parent 2f4e0c24ab33895a60baf9918cb6cb47a989b81c
parent 86824cf0a994abc38f08ac5692cf6b73cd10526e

am 86824cf0: am 3a3def13: am 0e8f02d6: am 76dcacad: am 1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup on null reference."

* commit '86824cf0a994abc38f08ac5692cf6b73cd10526e':
  Fixed race condition in Spinner.DialogPopup on null reference.

core/java/android/widget/Spinner.java

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