diff options
| author | Christopher Tate <ctate@android.com> | 2014-01-27 19:29:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-27 19:29:56 +0000 |
| commit | 1ff4293e33f98e6dc19e4f154cb497af9bd88c9d (patch) | |
| tree | 5d7aa78b9f49eed3be8c7d6fe485e629f6d51388 /core/java/android/widget/Spinner.java | |
| parent | db5257248637df729ec4f8db58bdfbf0660051b2 (diff) | |
| parent | 2f77f9c03e016f6d453c1fa799c9f68c30acf0dd (diff) | |
| download | frameworks_base-1ff4293e33f98e6dc19e4f154cb497af9bd88c9d.zip frameworks_base-1ff4293e33f98e6dc19e4f154cb497af9bd88c9d.tar.gz frameworks_base-1ff4293e33f98e6dc19e4f154cb497af9bd88c9d.tar.bz2 | |
Merge "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() { |