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

Merge "Fixing settings crash when no default home app is set" into pi-dev

Browse Source 
am: ee2ac81999

Change-Id: Ie74613b09179d9c518139cfc597ad62479d9d7c5
This commit is contained in:
Sunny Goyal
2018-03-20 05:22:09 +00:00
committed by android-build-merger
parent 5cf0b2843e ee2ac81999
commit 472037fdd3
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
View File

@@ -91,6 +91,9 @@ public class DefaultHomePreferenceController extends DefaultAppPreferenceControl
@Override @Override
protected Intent getSettingIntent(DefaultAppInfo info) { protected Intent getSettingIntent(DefaultAppInfo info) {
if (info == null) {
return null;
}
final String packageName; final String packageName;
if (info.componentName != null) { if (info.componentName != null) {
packageName = info.componentName.getPackageName(); packageName = info.componentName.getPackageName();

14
tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
View File

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