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

Merge "Only a test admin can be unmarked as a COPE admin" into tm-dev am: 9736fb2a2b am: 25211cdd5d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17822403

Change-Id: Ic56074544dce23366cd6c6c8ef8ecdd713aef124
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Johnston
2022-04-26 16:12:14 +00:00
committed by Automerger Merge Worker
parent 074b859ea0 25211cdd5d
commit fe1a1c1abc
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14656,6 +14656,13 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
throw new SecurityException( throw new SecurityException(
"Only the system can mark a profile owner of organization-owned device."); "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 (isAdb(caller)) {
if (hasIncompatibleAccountsOrNonAdbNoLock(caller, userId, who)) { if (hasIncompatibleAccountsOrNonAdbNoLock(caller, userId, who)) {