commit 047bf28243ab5916eecdfa2463ff3adbffda1a6a
author Pavel Grafov <pgrafov@google.com> Tue Feb 19 15:24:07 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 19 15:24:07 2019 +0000
tree 3b78aaf614a79704e5520447f096de63d9f00a39
parent 8b9abc98b5c3b459b6e6cbe218688ce415c5ba5e
parent 846ad2ded26516bae6bd674cd5c0e16604a49b57

Merge "Dummy change to test postsubmit invocation"

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

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 9523202..9767efd 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -5181,7 +5181,7 @@
         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;