diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-29 20:17:57 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-29 20:17:57 -0700 |
| commit | 62ebe364cb6d9bd63d5603c0569ed842c4492c63 (patch) | |
| tree | 05213f7f81f80b779d74c09b8b747f66b8d8d845 /core/java/android/widget/AutoCompleteTextView.java | |
| parent | 08bc0d51a0088405c89c28252fa8e9e790a52233 (diff) | |
| parent | 3a15fbd7df56e44060c78d7832fbea895ceb9bbf (diff) | |
| download | frameworks_base-62ebe364cb6d9bd63d5603c0569ed842c4492c63.zip frameworks_base-62ebe364cb6d9bd63d5603c0569ed842c4492c63.tar.gz frameworks_base-62ebe364cb6d9bd63d5603c0569ed842c4492c63.tar.bz2 | |
am 3a15fbd7: Merge change 5581 into donut
Merge commit '3a15fbd7df56e44060c78d7832fbea895ceb9bbf'
* commit '3a15fbd7df56e44060c78d7832fbea895ceb9bbf':
Add a null check in an AutoCompleteTextView callback to prevent a crash.
Diffstat (limited to 'core/java/android/widget/AutoCompleteTextView.java')
| -rw-r--r-- | core/java/android/widget/AutoCompleteTextView.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java index 96cc2fd..ba47df5 100644 --- a/core/java/android/widget/AutoCompleteTextView.java +++ b/core/java/android/widget/AutoCompleteTextView.java @@ -1185,7 +1185,11 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe int position, long id) { if (position != -1) { - mDropDownList.mListSelectionHidden = false; + DropDownListView dropDownList = mDropDownList; + + if (dropDownList != null) { + dropDownList.mListSelectionHidden = false; + } } } |