diff options
| author | Amith Yamasani <yamasani@google.com> | 2014-07-21 17:04:44 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2014-07-21 17:04:44 -0700 |
| commit | eee5094f96c630661ca563d70de244ccbbd53579 (patch) | |
| tree | fb9a739a7fc28a76bd1a96a6ec2f1bc5e56bc998 /services/devicepolicy | |
| parent | e5bcff624fb58b6f95be8ddff7f5b6b3bf5d19c7 (diff) | |
| download | frameworks_base-eee5094f96c630661ca563d70de244ccbbd53579.zip frameworks_base-eee5094f96c630661ca563d70de244ccbbd53579.tar.gz frameworks_base-eee5094f96c630661ca563d70de244ccbbd53579.tar.bz2 | |
Fix a security exception when checking cross-profile caller-id cap.
No need to enforce that the caller is in the system process.
We're only checking if the device policy is allowing access.
Bug: 16301261
Change-Id: I87a7c808d116c86aa68cebb36631c46d0a54be96
Diffstat (limited to 'services/devicepolicy')
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index c218d38..2a11252 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -4030,7 +4030,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { @Override public boolean getCrossProfileCallerIdDisabledForUser(int userId) { - enforceSystemProcess("getCrossProfileCallerIdDisabled can only be called by system"); + // TODO: Should there be a check to make sure this relationship is within a profile group? + //enforceSystemProcess("getCrossProfileCallerIdDisabled can only be called by system"); synchronized (this) { ActiveAdmin admin = getProfileOwnerAdmin(userId); return (admin != null) ? admin.disableCallerId : false; |