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

Commit 9736fb2a authored by Alex Johnston's avatar Alex Johnston Committed by Android (Google) Code Review
Browse files

Merge "Only a test admin can be unmarked as a COPE admin" into tm-dev

parents 4e612ce9 37259089

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

+7 −0
Original line number Diff line number Diff line
@@ -14656,6 +14656,13 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            throw new SecurityException(

                    "Only the system can mark a profile owner of organization-owned device.");

        }

        // Only a test admin can be unmarked as a profile owner on an organization-owned device.

        synchronized (getLockObject()) {

            if (!isProfileOwnerOnOrganizationOwnedDevice && !isAdminTestOnlyLocked(who, userId)) {

                throw new SecurityException("Only a test admin can be unmarked as a "

                        + "profile owner of organization-owned device.");

            }

        }















        if (isAdb(caller)) {















            if (hasIncompatibleAccountsOrNonAdbNoLock(caller, userId, who)) {