diff options
| author | Steve Kondik <shade@chemlab.org> | 2010-11-30 16:00:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2010-11-30 16:00:39 +0000 |
| commit | bb62fea5a8ffdb2d5a92b41f15ad08ebc6a2eb74 (patch) | |
| tree | a0dbdf7842c88d5f276270223429fee7efefde46 | |
| parent | ddaaf6c446c7bc615cfcb3305cfb03d0f48e75e6 (diff) | |
| parent | 289a1bda33adfb53469bdea97f67ae1ba50292bc (diff) | |
| download | frameworks_base-bb62fea5a8ffdb2d5a92b41f15ad08ebc6a2eb74.zip frameworks_base-bb62fea5a8ffdb2d5a92b41f15ad08ebc6a2eb74.tar.gz frameworks_base-bb62fea5a8ffdb2d5a92b41f15ad08ebc6a2eb74.tar.bz2 | |
Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser" into froyo
| -rw-r--r-- | core/java/android/app/SearchDialog.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java index cd22fa1..4a490a1 100644 --- a/core/java/android/app/SearchDialog.java +++ b/core/java/android/app/SearchDialog.java @@ -1109,6 +1109,9 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS * @return true if a successful launch, false if could not (e.g. bad position). */ protected boolean launchSuggestion(int position, int actionKey, String actionMsg) { + if (mSuggestionsAdapter == null) { + return false; + } Cursor c = mSuggestionsAdapter.getCursor(); if ((c != null) && c.moveToPosition(position)) { |