commit 0e8f02d68f8cfe14e14800520a8133bc7efd13b7
author Christopher Tate <ctate@android.com> Mon Jan 27 11:43:23 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 27 11:43:23 2014 -0800
tree c9249140e88307c9f8854942b40fca76a860002f
parent 15594557f118f670e8d8523e9aed0df3345d28ca
parent 76dcacada75f192d74ea83cf6b5ce1747c9437ad

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

* commit '76dcacada75f192d74ea83cf6b5ce1747c9437ad':
  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() {