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

Merge "Combine the checks for DO/PO in isAdminAffectedByRestriction()." into udc-dev am: 5bbe99a299

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

Change-Id: I872031e1264073f7b90a5b2015ffcdf9ce1b3b3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-04-03 13:10:43 +00:00
committed by Automerger Merge Worker
parent 2dc45e4756 5bbe99a299
commit 7477129bff
1 changed files with 1 additions and 2 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

@@ -12574,9 +12574,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
case UserManager.RESTRICTION_NOT_SET: case UserManager.RESTRICTION_NOT_SET:
return false; return false;
case UserManager.RESTRICTION_SOURCE_DEVICE_OWNER: case UserManager.RESTRICTION_SOURCE_DEVICE_OWNER:
return !isDeviceOwner(admin, userId);
case UserManager.RESTRICTION_SOURCE_PROFILE_OWNER: case UserManager.RESTRICTION_SOURCE_PROFILE_OWNER:
return !isProfileOwner(admin, userId); return !(isDeviceOwner(admin, userId) || isProfileOwner(admin, userId));
default: default:
return true; return true;
} }