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

Commit d8f2d700 authored by Alex Johnston's avatar Alex Johnston Committed by Android (Google) Code Review
Browse files

Merge "Replace enforceXXX methods (managed profile)"

parents e83b7f29 2ea3f948

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

+234 −214

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, "no default supervision component defined",

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

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

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