diff options
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/SuggestionsAdapter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/SuggestionsAdapter.java b/core/java/android/app/SuggestionsAdapter.java index 0bdb10b..49c94d1 100644 --- a/core/java/android/app/SuggestionsAdapter.java +++ b/core/java/android/app/SuggestionsAdapter.java @@ -147,7 +147,7 @@ class SuggestionsAdapter extends ResourceCursorAdapter { final Cursor cursor = mSearchManager.getSuggestions(mSearchable, query); // trigger fill window so the spinner stays up until the results are copied over and // closer to being ready - if (!mGlobalSearchMode) cursor.getCount(); + if (!mGlobalSearchMode && cursor != null) cursor.getCount(); return cursor; } catch (RuntimeException e) { Log.w(LOG_TAG, "Search suggestions query threw an exception.", e); |