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

am: 93ff2d69f1 Change-Id: I5d55d343a800b343e3cf859ff4cd4381927d56a2
2017-05-12 08:58:02 +00:00
parent 0e06c31bae 93ff2d69f1
commit d523a72f76
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
@@ -292,6 +292,9 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
     */
    @Override
    public void onIndexingFinished() {
+        if (getActivity() == null) {
+            return;
+        }
        if (mShowingSavedQuery) {
            mSavedQueryController.loadSavedQueries();
        } else {