Bug 1310621 - Drop the suggestions if search engines are not available. r=sebastian
MozReview-Commit-ID: FtGO45mfSay
--- a/mobile/android/base/java/org/mozilla/gecko/home/BrowserSearch.java
+++ b/mobile/android/base/java/org/mozilla/gecko/home/BrowserSearch.java
@@ -682,18 +682,23 @@ public class BrowserSearch extends HomeF
mSearchHistorySuggestionLoaderCallback = new SearchHistorySuggestionLoaderCallbacks();
}
getLoaderManager().restartLoader(LOADER_ID_SAVED_SUGGESTION, null, mSearchHistorySuggestionLoaderCallback);
}
private void setSuggestions(ArrayList<String> suggestions) {
ThreadUtils.assertOnUiThread();
- mSearchEngines.get(0).setSuggestions(suggestions);
- mAdapter.notifyDataSetChanged();
+ // mSearchEngines may be null if the setSuggestions calls after onDestroy (bug 1310621).
+ // So drop the suggestions if search engines are not available
+ if (mSearchEngines != null && !mSearchEngines.isEmpty()) {
+ mSearchEngines.get(0).setSuggestions(suggestions);
+ mAdapter.notifyDataSetChanged();
+ }
+
}
private void setSavedSuggestions(ArrayList<String> savedSuggestions) {
ThreadUtils.assertOnUiThread();
mSearchHistorySuggestions = savedSuggestions;
mAdapter.notifyDataSetChanged();
}