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

Merge "Check if pref is disabled by admin" into sc-v2-dev am: 87b3974dfd am: cd467e99d8

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16199770

Change-Id: Ib57d1de7591e1429440f746839078594fd97dfef
This commit is contained in:
TreeHugger Robot
2021-11-08 16:50:47 +00:00
committed by Automerger Merge Worker
parent 3b7e256d37 cd467e99d8
commit 7e94a9ff62
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,7 +178,8 @@ public class RedactNotificationPreferenceController extends TogglePreferenceCont
private boolean getAllowPrivateNotifications(int userId) {
return Settings.Secure.getIntForUser(mContext.getContentResolver(),
LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 1, userId) != 0;
LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 1, userId) != 0
&& getEnforcedAdmin(userId) == null;
}
private boolean getLockscreenNotificationsEnabled(int userId) {

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

@@ -292,6 +292,18 @@ public class RedactNotificationPreferenceControllerTest {
assertThat(mWorkController.isChecked()).isFalse();
}
@Test
public void isChecked_admin() {
Settings.Secure.putIntForUser(mContext.getContentResolver(),
LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
1, 0);
ShadowRestrictedLockUtilsInternal.setKeyguardDisabledFeatures(
KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
assertThat(mController.isChecked()).isFalse();
}
@Test
public void setChecked_false() throws Exception {
Settings.Secure.putIntForUser(mContext.getContentResolver(),