Commit 86824cf0 authored Jan 27, 2014 by Christopher Tate Committed by Android Git Automerger Jan 27, 2014

am 3a3def13: am 0e8f02d6: am 76dcacad: am 1ff4293e: Merge "Fixed race...

am 3a3def13: am 0e8f02d6: am 76dcacad: am 1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup on null reference."

* commit '3a3def13':
  Fixed race condition in Spinner.DialogPopup on null reference.

parents 698d3673 3a3def13

core/java/android/widget/Spinner.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -952,9 +952,11 @@ public class Spinner extends AbsSpinner implements OnClickListener {
		private CharSequence mPrompt;

		public void dismiss() {
		if (mPopup != null) {
		mPopup.dismiss();
		mPopup = null;
		}
		}

		public boolean isShowing() {
		return mPopup != null ? mPopup.isShowing() : false;