Merge "Fix NPE when Spinner is reused." (da2ccb49) · Commits · e / os / android_frameworks_base

core/java/android/widget/Spinner.java

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -144,7 +144,6 @@ public class Spinner extends AbsSpinner implements OnClickListener {

	if (mPopup != null && mPopup.isShowing()) {		if (mPopup != null && mPopup.isShowing()) {
	mPopup.dismiss();		mPopup.dismiss();
	mPopup = null;
	}		}
	}		}

	@@ -316,7 +315,6 @@ public class Spinner extends AbsSpinner implements OnClickListener {
	public void onClick(DialogInterface dialog, int which) {		public void onClick(DialogInterface dialog, int which) {
	setSelection(which);		setSelection(which);
	dialog.dismiss();		dialog.dismiss();
	mPopup = null;
	}		}

	/**		/**
	@@ -543,6 +541,7 @@ public class Spinner extends AbsSpinner implements OnClickListener {
	}		}
	}		}

			@Override
	public void show() {		public void show() {
	if (mHintView == null) {		if (mHintView == null) {
	final TextView textView = (TextView) LayoutInflater.from(getContext()).inflate(		final TextView textView = (TextView) LayoutInflater.from(getContext()).inflate(