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

Fix NPE in AutoSyncWorkDataPreferenceController

Browse Source 
AutoSyncWorkDataPreferenceController gets mUserHandle from
Utils.getManagedProfileWithDisabled which may return null,
crash will happend when updateState called.
So a judgement here seems helpful to make the program more robust.

Bug: https://partnerissuetracker.corp.google.com/u/1/issues/72908879
Test: make ROBOTEST_FILTER="(AutoSyncWorkDataPreferenceControllerTest)"
RunSettingsRoboTests

Change-Id: I53ca027a2f2dd79655cc2eee67db236cfa03f656
Signed-off-by: tiansiming [田思明] <tiansiming@xiaomi.com>
This commit is contained in:
tiansiming [田思明]
2018-02-04 20:45:42 +08:00
parent f94ff6ce6f
commit 6cdb07862a
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
View File

@@ -91,6 +91,21 @@ public class AutoSyncWorkDataPreferenceControllerTest {
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void checkIsAvailable_null_workProfileUserHandle_shouldNotDisplay() {
when(mUserManager.isManagedProfile()).thenReturn(false);
when(mUserManager.isLinkedUser()).thenReturn(false);
final List<UserInfo> infos = new ArrayList<>();
infos.add(new UserInfo(UserHandle.USER_SYSTEM, "user 1", 0 /* flags */));
infos.add(new UserInfo(999, "xspace", 800010));
when(mUserManager.getProfiles(eq(UserHandle.USER_SYSTEM))).thenReturn(infos);
mController = new AutoSyncWorkDataPreferenceController(mContext, mFragment);
assertThat(mController.mUserHandle).isEqualTo(null);
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void multipleProfile_shouldInitWithWorkProfileUserHandle() {
when(mUserManager.isManagedProfile()).thenReturn(false);