diff options
| author | Bjorn Bringert <bringert@android.com> | 2009-06-24 15:16:30 +0100 |
|---|---|---|
| committer | Bjorn Bringert <bringert@android.com> | 2009-06-24 15:16:30 +0100 |
| commit | 544450b4eee175c78a1ca8647a3bfaca4aecf47a (patch) | |
| tree | 93628d5e0a6409ed29fc36ccbefaaf95a88a065a /core/java | |
| parent | 5f80605a0b866f34c74955e190909bd6ab5d992e (diff) | |
| download | frameworks_base-544450b4eee175c78a1ca8647a3bfaca4aecf47a.zip frameworks_base-544450b4eee175c78a1ca8647a3bfaca4aecf47a.tar.gz frameworks_base-544450b4eee175c78a1ca8647a3bfaca4aecf47a.tar.bz2 | |
Fix NPE in SuggestionsAdapter when cursor is null.
Fixes http://b/issue?id=1940013
Diffstat (limited to 'core/java')
| -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); |