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

* commit '1ff4293e33f98e6dc19e4f154cb497af9bd88c9d': Fixed race condition in Spinner.DialogPopup on null reference.
2014-01-27 11:40:51 -08:00
parent 137d74d89c 1ff4293e33
commit 76dcacada7
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() {