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

Commit 73b4b64b authored by Eran Messeri's avatar Eran Messeri Committed by Android (Google) Code Review
Browse files

Merge "Temporarily restore device identifiers access to Profile Owner"

parents e1fa031c 53c777b2

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

+8 −2
Original line number Diff line number Diff line
@@ -8701,9 +8701,15 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
        // Allow access to the profile owner for the specified user, or delegate cert installer

        // But only if this is an organization-owned device.

        ComponentName profileOwner = getProfileOwnerAsUser(userId);

        if (profileOwner != null && canProfileOwnerAccessDeviceIds(userId)

        final boolean isCallerProfileOwnerOrDelegate = profileOwner != null

                && (profileOwner.getPackageName().equals(packageName)

                || isCallerDelegate(packageName, uid, DELEGATION_CERT_INSTALL))) {

                        || isCallerDelegate(packageName, uid, DELEGATION_CERT_INSTALL));

        if (isCallerProfileOwnerOrDelegate && canProfileOwnerAccessDeviceIds(userId)) {

            return true;

        }

        //TODO(b/130844684): Temporarily allow profile owner on non-organization-owned devices

        //to read device identifiers.

        if (isCallerProfileOwnerOrDelegate) {

            return true;

        }