Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser"

2010-11-22 13:40:29 -08:00
parent e2ec61b23b b00d41acd6
commit b2b0db2d5c
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/app/SearchDialog.java
+++ b/core/java/android/app/SearchDialog.java
@ -1107,6 +1107,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)) {