Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ee5c41f5: Merge "Fix a security exception when checking cross-profile caller-id cap." into lmp-dev

Browse Source 
* commit 'ee5c41f5360226c2579055a787da875e1a5ada90':
  Fix a security exception when checking cross-profile caller-id cap.
This commit is contained in:
Amith Yamasani
2014-07-22 00:12:39 +00:00
committed by Android Git Automerger
parent 85aa2ba71d b74a7babaa
commit 5f7d75ca46
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -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;