diff options
| author | Christopher Tate <ctate@android.com> | 2014-01-27 19:48:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-27 19:48:03 +0000 |
| commit | 3a3def1304b0fa9ed72003882716ad43e85b13d3 (patch) | |
| tree | 6321a11191f7efd7f3c221e7af27266ee2f8d06b /core/java/android/widget/Spinner.java | |
| parent | 4a750c1f4a2760ae564fa56717c04a5f01396090 (diff) | |
| parent | 0e8f02d68f8cfe14e14800520a8133bc7efd13b7 (diff) | |
| download | frameworks_base-3a3def1304b0fa9ed72003882716ad43e85b13d3.zip frameworks_base-3a3def1304b0fa9ed72003882716ad43e85b13d3.tar.gz frameworks_base-3a3def1304b0fa9ed72003882716ad43e85b13d3.tar.bz2 | |
am 0e8f02d6: am 76dcacad: am 1ff4293e: Merge "Fixed race condition in Spinner.DialogPopup on null reference."
* commit '0e8f02d68f8cfe14e14800520a8133bc7efd13b7':
Fixed race condition in Spinner.DialogPopup on null reference.
Diffstat (limited to 'core/java/android/widget/Spinner.java')
| -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() { |