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

Merge "Re-add ComponentName null check for setOrganisationName." into udc-dev am: d5842c6f78

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

Change-Id: Id0f69f04faebfab71064815676c841e1a6e0d8ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-04-13 11:44:50 +00:00
committed by Automerger Merge Worker
parent 8d8b5160ff d5842c6f78
commit 1d2b89145f
1 changed files with 2 additions and 0 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

@@ -17365,6 +17365,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
caller.getUserId());
admin = enforcingAdmin.getActiveAdmin();
} else {
Objects.requireNonNull(who, "ComponentName is null");
Preconditions.checkCallAuthorization(isDeviceOwner(caller) || isProfileOwner(caller));
}
@@ -17396,6 +17397,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
caller.getUserId());
admin = enforcingAdmin.getActiveAdmin();
} else {
Objects.requireNonNull(who, "ComponentName is null");
Preconditions.checkCallingUser(isManagedProfile(caller.getUserId()));
Preconditions.checkCallAuthorization(isDeviceOwner(caller) || isProfileOwner(caller));