Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42896d7f authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Check if pref is disabled by admin 

Test: robotests
Fixes: 137638270
Change-Id: I39953d5b7466281cff7a9a7ffaeb5ba99ab12934
parent 9ae7fa25

src/com/android/settings/notification/RedactNotificationPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {

tests/robotests/src/com/android/settings/notification/RedactNotificationPreferenceControllerTest.java

+12 −0
Original line number Diff line number Diff line
@@ -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(),