diff options
| author | Amith Yamasani <yamasani@google.com> | 2015-05-05 17:16:18 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2015-05-05 17:16:18 -0700 |
| commit | 6f36d42dcc46eae3a0388828b13314a823e3ce57 (patch) | |
| tree | dc8665e3eda56bf9f73ad94eafe0eb043eb64c78 /services/devicepolicy | |
| parent | e678b41cdb56847c094260607ea39aea4abb808e (diff) | |
| download | frameworks_base-6f36d42dcc46eae3a0388828b13314a823e3ce57.zip frameworks_base-6f36d42dcc46eae3a0388828b13314a823e3ce57.tar.gz frameworks_base-6f36d42dcc46eae3a0388828b13314a823e3ce57.tar.bz2 | |
Permission policies are for profile and device owners
Not just device owners
Change-Id: I78ad815651e9bdc4bd78e61d634a5067935fa33f
Diffstat (limited to 'services/devicepolicy')
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |