commit da2ccb49b1c9941db3a4713df0b6020ba7d1e801
author Daisuke Miyakawa <dmiyakawa@google.com> Mon Aug 30 12:22:47 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 30 12:22:47 2010 -0700
tree 8e026a6d7955d9631e45ef8b1e2576fe947bb12d
parent 6dabe240ed0adcf74d0b5eed37d7085095e20ffd
parent 3f10b1c8f841113b93d2dfecdd84a1dfb1008faf

Merge "Fix NPE when Spinner is reused."

core/java/android/widget/Spinner.java

diff --git a/core/java/android/widget/Spinner.java b/core/java/android/widget/Spinner.java
index b534c34..58c2613 100644
--- a/core/java/android/widget/Spinner.java
+++ b/core/java/android/widget/Spinner.java
@@ -78,7 +78,7 @@
             mPopup = new DialogPopup();
             break;
         }
-        
+
         case MODE_DROPDOWN: {
             final int hintResource = a.getResourceId(
                     com.android.internal.R.styleable.Spinner_popupPromptView, 0);
@@ -144,7 +144,6 @@
         
         if (mPopup != null && mPopup.isShowing()) {
             mPopup.dismiss();
-            mPopup = null;
         }
     }
 
@@ -316,7 +315,6 @@
     public void onClick(DialogInterface dialog, int which) {
         setSelection(which);
         dialog.dismiss();
-        mPopup = null;
     }
 
     /**
@@ -542,7 +540,8 @@
                 mHintView.setText(hintText);
             }
         }
-        
+
+        @Override
         public void show() {
             if (mHintView == null) {
                 final TextView textView = (TextView) LayoutInflater.from(getContext()).inflate(