diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-22 13:48:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-22 13:48:06 -0800 |
| commit | 4e256eae3ca61388386dea22497b66df93e9cac9 (patch) | |
| tree | b69126ba078ba0439f8e7d9b07e5f4a11ccfa756 /core/java/android/app/SearchDialog.java | |
| parent | 83d97c8c7ddff9374f876bef48758414a7775cb1 (diff) | |
| parent | c8454a851f26b78de77c0f6b1aa746ce3e2517f1 (diff) | |
am c8454a85: am b2b0db2d: Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser"
* commit 'c8454a851f26b78de77c0f6b1aa746ce3e2517f1':
SearchDialog: Fix for NullpointerException while using Suggestions in Browser
Diffstat (limited to 'core/java/android/app/SearchDialog.java')
| -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 18602dfa0a2a..0c280f99e50b 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)) { |