commit 415b46c32ba17ce80bb133e9f0e24a8e08371dc4
author Kenny Root <kroot@google.com> Fri Mar 19 11:59:56 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 19 11:59:56 2010 -0700
tree ef9e83f1c73ffb442375936d2cf66071e7b9de5b
parent 4d9840bfc8dd86a5b4fc40dc5cf9f5f1d465bdc6
parent 7254afd4c275dec243d4825f8f68c815ced1342c

Merge "Ensure adapter is not null in AutoCompleteTextView"

core/java/android/widget/AutoCompleteTextView.java

diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java
index 5b52107..eb2da71 100644
--- a/core/java/android/widget/AutoCompleteTextView.java
+++ b/core/java/android/widget/AutoCompleteTextView.java
@@ -1629,7 +1629,10 @@
                 // of iterating throught he list of observers.
                 post(new Runnable() {
                     public void run() {
-                        updateDropDownForFilter(mAdapter.getCount());
+                        final ListAdapter adapter = mAdapter;
+                        if (adapter != null) {
+                            updateDropDownForFilter(adapter.getCount());
+                        }
                     }
                 });
             }