commit f45bdaf512093e6318db5a277c5934596e015b84
author Alan Viverette <alanv@google.com> Tue Jul 30 18:04:18 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 30 18:04:18 2013 +0000
tree 2b1d5ed423bb63e979a5862b1e48ea9956d91c2a
parent 56fbb6362b6a0f17804d33af913b720f21c884c5
parent b9867eab1de3396fc7e740d6afbc5ee649f416f1

Merge "Don't show spinner popup if adapter is null"

core/java/android/widget/Spinner.java

diff --git a/core/java/android/widget/Spinner.java b/core/java/android/widget/Spinner.java
index 789d263a..eec15a9 100644
--- a/core/java/android/widget/Spinner.java
+++ b/core/java/android/widget/Spinner.java
@@ -937,6 +937,9 @@
         }
 
         public void show(int textDirection, int textAlignment) {
+            if (mListAdapter == null) {
+                return;
+            }
             AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
             if (mPrompt != null) {
                 builder.setTitle(mPrompt);