Merge "Fix crash when activity not attached after search index finishes." into oc-dev (93ff2d69) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/search2/SearchFragment.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -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 −0

Original line number	Diff line number	Diff line
		@@ -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
		}
		}