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

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

Merge "Revert "Replace enforceXXX methods (managed profile)""

parents 67af626d 900981c9

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)));