diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-22 13:44:56 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-22 13:44:56 -0800 |
| commit | c8454a851f26b78de77c0f6b1aa746ce3e2517f1 (patch) | |
| tree | a31f08a4b565028ea9f7cb612d5514639c45e0be /core | |
| parent | e489d48f7c95b874ee7820d1052d862109244437 (diff) | |
| parent | b2b0db2d5c89ae8824a4cb5d7944bae3a1dc8bf4 (diff) | |
| download | frameworks_base-c8454a851f26b78de77c0f6b1aa746ce3e2517f1.zip frameworks_base-c8454a851f26b78de77c0f6b1aa746ce3e2517f1.tar.gz frameworks_base-c8454a851f26b78de77c0f6b1aa746ce3e2517f1.tar.bz2 | |
am b2b0db2d: Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser"
* commit 'b2b0db2d5c89ae8824a4cb5d7944bae3a1dc8bf4':
SearchDialog: Fix for NullpointerException while using Suggestions in Browser
Diffstat (limited to 'core')
| -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 1f115e8..4eb89ae 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)) { |