Merge "Check if pref is disabled by admin" into sc-v2-dev

2021-11-08 16:16:53 +00:00
parent 309426bbea 42896d7fe1
commit 87b3974dfd
2 changed files with 14 additions and 1 deletions
--- a/src/com/android/settings/notification/RedactNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/RedactNotificationPreferenceController.java
@@ -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) {