PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: d3e33ebcef

Change-Id: Idc21289911d064e676f86bae72bdc188eb07f260
This commit is contained in:
Doris Ling
2017-05-12 04:57:40 +00:00
committed by android-build-merger
parent 715f096678 d3e33ebcef
commit 93ff2d69f1
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/search2/SearchFragment.java
View File

@@ -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 {

17
tests/robotests/src/com/android/settings/search2/SearchFragmentTest.java
View File

@@ -349,4 +349,21 @@ public class SearchFragmentTest {
verify(fragment.mSavedQueryController).loadSavedQueries();
}
@Test
public void onIndexingFinished_noActivity_shouldNotCrash() {
ActivityController<SearchActivity> activityController =
Robolectric.buildActivity(SearchActivity.class);
activityController.setup();
SearchFragment fragment = (SearchFragment) spy(activityController.get().getFragmentManager()
.findFragmentById(R.id.main_content));
when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
.thenReturn(true);
fragment.mQuery = "bright";
ReflectionHelpers.setField(fragment, "mLoaderManager", null);
ReflectionHelpers.setField(fragment, "mHost", null);
fragment.onIndexingFinished();
// no crash
}
}