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.
2014-01-27 11:43:23 -08:00
parent 15594557f1 76dcacada7
commit 0e8f02d68f
1 changed files with 4 additions and 2 deletions
--- a/core/java/android/widget/Spinner.java
+++ b/core/java/android/widget/Spinner.java
@@ -952,8 +952,10 @@ public class Spinner extends AbsSpinner implements OnClickListener {
        private CharSequence mPrompt;

        public void dismiss() {
-            mPopup.dismiss();
-            mPopup = null;
+            if (mPopup != null) {
+                mPopup.dismiss();
+                mPopup = null;
+            }
        }

        public boolean isShowing() {