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

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

Change-Id: I57b5410d68e8fc9b701b2f0ff41ebfddf48e9733
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Rubin Xu
2023-03-09 11:46:57 +00:00
committed by Automerger Merge Worker
parent 4c0ce3ad90 f750196ca6
commit 3a9797a462
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());