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

Commit 900981c9 authored by Alex Johnston's avatar Alex Johnston
Browse files

Revert "Replace enforceXXX methods (managed profile)" 

This reverts commit 52743c9a.

Reason for revert: Unable to setup work profile

Bug: 168776733
Change-Id: I1889da2f4501344f76e4b6d9d33b08bf719b5237
parent 52743c9a

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+214 −236

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -4407,7 +4407,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 


        // Caller is Profile Owner, but no supervision app is configured.

        setAsProfileOwner(admin1);

        assertExpectException(SecurityException.class, "is not the default supervision component",

        assertExpectException(SecurityException.class, "no default supervision component defined",

                () -> dpm.setSecondaryLockscreenEnabled(admin1, true));

        assertFalse(dpm.isSecondaryLockscreenEnabled(UserHandle.of(CALLER_USER_HANDLE)));