commit 71e06d9d29f732a9df47702d8ea8db96c378f88f
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 21 17:35:44 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 21 17:35:49 2017 +0000
tree 4bc3676b1000ebe082e15b1cf314f65d1eada97c
parent 41bd1ec4db9318d4a77b0b5689c876c8d955dc90
parent c8aeef6ae6469c1db5e7a67eb2e968d29c84e908

Merge "Remove leftover DO/PO check in isPackageSuspended"

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 a916672..536d454 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -8192,7 +8192,6 @@
             // Ensure the caller is a DO/PO or a package access delegate.
             enforceCanManageScope(who, callerPackage, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER,
                     DELEGATION_PACKAGE_ACCESS);
-            getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);
 
             long id = mInjector.binderClearCallingIdentity();
             try {