Merge "Fixed race condition in Spinner.DialogPopup on null reference."

2014-01-27 19:29:56 +00:00
parent db52572486 2f77f9c03e
commit 1ff4293e33
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() {