Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 544450b4: Fix NPE in SuggestionsAdapter when cursor is null.

Browse Source 
Merge commit '544450b4eee175c78a1ca8647a3bfaca4aecf47a'

* commit '544450b4eee175c78a1ca8647a3bfaca4aecf47a':
  Fix NPE in SuggestionsAdapter when cursor is null.
This commit is contained in:
Bjorn Bringert
2009-06-24 13:54:05 -07:00
committed by The Android Open Source Project
parent 43cc2bac7e 544450b4ee
commit ffcdad9faa
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/SuggestionsAdapter.java
View File

@@ -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);