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

Commit 047bf282 authored by Pavel Grafov's avatar Pavel Grafov Committed by Android (Google) Code Review
Browse files

Merge "Dummy change to test postsubmit invocation"

parents 8b9abc98 846ad2de

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

+1 −1
Original line number Diff line number Diff line
@@ -5181,7 +5181,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
        Preconditions.checkNotNull(who, "ComponentName is null");

        final int userHandle = mInjector.userHandleGetCallingUserId();

        synchronized (getLockObject()) {

            ActiveAdmin ap = getActiveAdminForCallerLocked(

            final ActiveAdmin ap = getActiveAdminForCallerLocked(

                    who, DeviceAdminInfo.USES_POLICY_FORCE_LOCK, parent);

            if (ap.maximumTimeToUnlock != timeMs) {

                ap.maximumTimeToUnlock = timeMs;