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

Fix NPE in SuggestionsAdapter when cursor is null.

Browse Source 
Fixes http://b/issue?id=1940013
This commit is contained in:
Bjorn Bringert
2009-06-24 15:16:30 +01:00
parent 5f80605a0b
commit 544450b4ee
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); final Cursor cursor = mSearchManager.getSuggestions(mSearchable, query);
// trigger fill window so the spinner stays up until the results are copied over and // trigger fill window so the spinner stays up until the results are copied over and
// closer to being ready // closer to being ready
if (!mGlobalSearchMode) cursor.getCount(); if (!mGlobalSearchMode && cursor != null) cursor.getCount();
return cursor; return cursor;
} catch (RuntimeException e) { } catch (RuntimeException e) {
Log.w(LOG_TAG, "Search suggestions query threw an exception.", e); Log.w(LOG_TAG, "Search suggestions query threw an exception.", e);