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

Merge "Fix work profile setting appearing too often" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-10 13:26:31 +00:00
committed by Android (Google) Code Review
parent 021e6b131f 540ad99d88
commit 9cb5ab3860
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/notification/RedactNotificationPreferenceController.java
View File

@@ -116,7 +116,7 @@ public class RedactNotificationPreferenceController extends TogglePreferenceCont
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
// hide work profile setting if no work profile // hide work profile setting if no work profile
if (KEY_LOCKSCREEN_WORK_PROFILE_REDACT.equals(getPreferenceKey()) if (KEY_LOCKSCREEN_WORK_PROFILE_REDACT.equals(getPreferenceKey())
&& mProfileUserId == UserHandle.USER_NULL) { && mProfileUserId == UserHandle.myUserId()) {
return CONDITIONALLY_UNAVAILABLE; return CONDITIONALLY_UNAVAILABLE;
} }

2
tests/robotests/src/com/android/settings/notification/RedactNotificationPreferenceControllerTest.java
View File

@@ -137,7 +137,7 @@ public class RedactNotificationPreferenceControllerTest {
@Test @Test
public void getAvailabilityStatus_noWorkProfile() { public void getAvailabilityStatus_noWorkProfile() {
// reset controllers with no work profile // reset controllers with no work profile
when(mUm.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[] {UserHandle.USER_NULL}); when(mUm.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[] {UserHandle.myUserId()});
mWorkController = new RedactNotificationPreferenceController(mMockContext, mWorkController = new RedactNotificationPreferenceController(mMockContext,
RedactNotificationPreferenceController.KEY_LOCKSCREEN_WORK_PROFILE_REDACT); RedactNotificationPreferenceController.KEY_LOCKSCREEN_WORK_PROFILE_REDACT);
mController = new RedactNotificationPreferenceController(mMockContext, mController = new RedactNotificationPreferenceController(mMockContext,