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

Merge "Fix DefaultSmsApplicationTest for organization-owned profile owner" into udc-dev am: f750196ca6 am: f1d3928094

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

Change-Id: I1c6b9d501fbf3f249a269230af701a315f8ff559
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Rubin Xu
2023-03-09 12:16:48 +00:00
committed by Automerger Merge Worker
parent e66c60422b f1d3928094
commit d6b4a2e018
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11219,7 +11219,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
} else {
Objects.requireNonNull(admin, "ComponentName is null");
Preconditions.checkCallAuthorization(isDefaultDeviceOwner(caller)
|| (parent && isProfileOwnerOfOrganizationOwnedDevice(caller)));
|| isProfileOwnerOfOrganizationOwnedDevice(caller));
}
if (parent) {
userId = getProfileParentId(mInjector.userHandleGetCallingUserId());