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

Browse Source
This commit is contained in:
Rubin Xu
2023-03-09 11:06:34 +00:00
committed by Android (Google) Code Review
parent c840f6b922 fb41da4662
commit f750196ca6
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 { } else {
Objects.requireNonNull(admin, "ComponentName is null"); Objects.requireNonNull(admin, "ComponentName is null");
Preconditions.checkCallAuthorization(isDefaultDeviceOwner(caller) Preconditions.checkCallAuthorization(isDefaultDeviceOwner(caller)
|| (parent && isProfileOwnerOfOrganizationOwnedDevice(caller))); || isProfileOwnerOfOrganizationOwnedDevice(caller));
} }
if (parent) { if (parent) {
userId = getProfileParentId(mInjector.userHandleGetCallingUserId()); userId = getProfileParentId(mInjector.userHandleGetCallingUserId());