diff options
| author | Christopher Tate <ctate@android.com> | 2014-01-27 19:54:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-27 19:54:30 +0000 |
| commit | 86824cf0a994abc38f08ac5692cf6b73cd10526e (patch) | |
| tree | 81223c6313040041c46e590a387d9f6fb1cf43ee | |
| parent | 698d36731700b168e5debf8c3904d1106f4da20a (diff) | |
| parent | 3a3def1304b0fa9ed72003882716ad43e85b13d3 (diff) | |
| download | frameworks_base-86824cf0a994abc38f08ac5692cf6b73cd10526e.zip frameworks_base-86824cf0a994abc38f08ac5692cf6b73cd10526e.tar.gz frameworks_base-86824cf0a994abc38f08ac5692cf6b73cd10526e.tar.bz2 | |
am 3a3def13: am 0e8f02d6: am 76dcacad: am 1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup on null reference."
* commit '3a3def1304b0fa9ed72003882716ad43e85b13d3':
Fixed race condition in Spinner.DialogPopup on null reference.
| -rw-r--r-- | core/java/android/widget/Spinner.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/widget/Spinner.java b/core/java/android/widget/Spinner.java index b75d36f..5cbabef 100644 --- 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() { |