From 3f10b1c8f841113b93d2dfecdd84a1dfb1008faf Mon Sep 17 00:00:00 2001
From: Daisuke Miyakawa <dmiyakawa@google.com>
Date: Sat, 28 Aug 2010 15:59:56 -0700
Subject: [PATCH] Fix NPE when Spinner is reused.

Bug: 2958228
Change-Id: I2c5e322b92fd4896361d02a307d0ba0ef3d33029
---
 core/java/android/widget/Spinner.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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