commit 76dcacada75f192d74ea83cf6b5ce1747c9437ad
author Christopher Tate <ctate@android.com> Mon Jan 27 11:40:51 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 27 11:40:51 2014 -0800
tree 166a6fc8adde11db2d95e0888b8dfae4c0f46066
parent 137d74d89cc57d146af8ca91ad7830a950c7e8b8
parent 1ff4293e33f98e6dc19e4f154cb497af9bd88c9d

am 1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup on null reference."

* commit '1ff4293e33f98e6dc19e4f154cb497af9bd88c9d':
  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 b75d36f..5cbabef 100644
--- a/core/java/android/widget/Spinner.java
+++ b/core/java/android/widget/Spinner.java
@@ -952,8 +952,10 @@
         private CharSequence mPrompt;
 
         public void dismiss() {
-            mPopup.dismiss();
-            mPopup = null;
+            if (mPopup != null) {
+                mPopup.dismiss();
+                mPopup = null;
+            }
         }
 
         public boolean isShowing() {