Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b74a7bab authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

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

parents 9c449339 eee5094f

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -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;