Merge "Dummy change to test postsubmit invocation"
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user