Merge "Fixing settings crash when no default home app is set" into pi-dev am: ee2ac81999 (e89345ac) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,9 @@ public class DefaultHomePreferenceController extends DefaultAppPreferenceControl

		@Override
		protected Intent getSettingIntent(DefaultAppInfo info) {
		if (info == null) {
		return null;
		}
		final String packageName;
		if (info.componentName != null) {
		packageName = info.componentName.getPackageName();

+14 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,13 @@ public class DefaultHomePreferenceControllerTest {
		verify(mPackageManager).getHomeActivities(anyList());
		}

		@Test
		public void getDefaultApp_noDefaultHome_shouldReturnNull() {
		when(mPackageManager.getHomeActivities(anyList())).thenReturn(null);

		assertThat(mController.getDefaultAppInfo()).isNull();
		}

		@Test
		public void updateState_noDefaultApp_shouldAskPackageManagerForOnlyApp() {
		when(mPackageManager.getHomeActivities(anyList())).thenReturn(null);
		@@ -152,4 +159,11 @@ public class DefaultHomePreferenceControllerTest {
		.thenReturn(Arrays.asList(mock(ResolveInfo.class), mock(ResolveInfo.class)));
		assertThat(mController.getSettingIntent(mController.getDefaultAppInfo())).isNull();
		}

		@Test
		public void testGetSettingIntent_noDefauldHome_shouldReturnNull() {
		when(mPackageManager.getHomeActivities(anyList())).thenReturn(null);
		assertThat(mController.getSettingIntent(mController.getDefaultAppInfo())).isNull();
		}

		}