summaryrefslogtreecommitdiff
path: root/core/java/android/widget/AutoCompleteTextView.java
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-03-19 10:09:59 -0700
committerKenny Root <kroot@google.com>2010-03-19 10:15:29 -0700
commit7254afd4c275dec243d4825f8f68c815ced1342c (patch)
tree93025d00bac86e3b7120581930d0eab2c0b0381f /core/java/android/widget/AutoCompleteTextView.java
parentb05ec11868463fef0322689f5c0b0408a6a0e540 (diff)
Ensure adapter is not null in AutoCompleteTextView
A runnable is posted for AutoCompleteTextView's PopupDataSetObserver, but there's a possibility that mAdapter would be set to null between when the runnable is run and the time it is posted. This fixes a monkey crash seen in build 29176. Change-Id: Ie7be51db580d6e9775533890e5f6902409bec84d MonkeyCrashID: 2071507494::1632:123:521
Diffstat (limited to 'core/java/android/widget/AutoCompleteTextView.java')
-rw-r--r--core/java/android/widget/AutoCompleteTextView.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java
index 5b521072b41e..eb2da7149762 100644
--- a/core/java/android/widget/AutoCompleteTextView.java
+++ b/core/java/android/widget/AutoCompleteTextView.java
@@ -1629,7 +1629,10 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
// 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());
+ }
}
});
}