Merge "Fix crash when activity not attached after search index finishes." into oc-dev

am: d3e33ebcef Change-Id: Idc21289911d064e676f86bae72bdc188eb07f260
2017-05-12 04:57:40 +00:00
parent 715f096678 d3e33ebcef
commit 93ff2d69f1
2 changed files with 20 additions and 0 deletions
--- a/src/com/android/settings/search2/SearchFragment.java
+++ b/src/com/android/settings/search2/SearchFragment.java
@@ -291,6 +291,9 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
     */
    @Override
    public void onIndexingFinished() {
+        if (getActivity() == null) {
+            return;
+        }
        if (mShowingSavedQuery) {
            mSavedQueryController.loadSavedQueries();
        } else {