From 6f36d42dcc46eae3a0388828b13314a823e3ce57 Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Tue, 5 May 2015 17:16:18 -0700 Subject: Permission policies are for profile and device owners Not just device owners Change-Id: I78ad815651e9bdc4bd78e61d634a5067935fa33f --- .../com/android/server/devicepolicy/DevicePolicyManagerService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'services/devicepolicy/java/com/android') diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index c886c4c..a8ec867 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -6313,7 +6313,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { public void setPermissionPolicy(ComponentName admin, int policy) throws RemoteException { int userId = UserHandle.getCallingUserId(); synchronized (this) { - getActiveAdminForCallerLocked(admin, DeviceAdminInfo.USES_POLICY_DEVICE_OWNER); + getActiveAdminForCallerLocked(admin, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER); DevicePolicyData userPolicy = getUserData(userId); if (userPolicy.mPermissionPolicy != policy) { userPolicy.mPermissionPolicy = policy; @@ -6336,7 +6336,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { String permission, boolean granted) throws RemoteException { UserHandle user = Binder.getCallingUserHandle(); synchronized (this) { - getActiveAdminForCallerLocked(admin, DeviceAdminInfo.USES_POLICY_DEVICE_OWNER); + getActiveAdminForCallerLocked(admin, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER); long ident = Binder.clearCallingIdentity(); try { if (granted) { -- cgit v1.1