release-request-655284b0-7f0b-48b5-b01d-27f48a99f2c0-for-git_oc-mr1-release-4017105 snap-temp-L82600000064873863
Change-Id: Iddc555728873946c15258883a81a5cbd0f389630
diff --git a/src/com/android/quicksearchbox/SearchActivity.java b/src/com/android/quicksearchbox/SearchActivity.java
index d17e436..050fc89 100644
--- a/src/com/android/quicksearchbox/SearchActivity.java
+++ b/src/com/android/quicksearchbox/SearchActivity.java
@@ -367,7 +367,11 @@
}
protected SuggestionCursor getCurrentSuggestions() {
- return mSearchActivityView.getSuggestions().getResult();
+ Suggestions suggestions = mSearchActivityView.getSuggestions();
+ if (suggestions == null) {
+ return null;
+ }
+ return suggestions.getResult();
}
protected SuggestionPosition getCurrentSuggestions(SuggestionsAdapter<?> adapter, long id) {
