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

Browse Source
This commit is contained in:
Treehugger Robot
2023-04-13 11:12:03 +00:00
committed by Android (Google) Code Review
parent f76eaf9aa3 cfa3bbaac6
commit d5842c6f78
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()); caller.getUserId());
admin = enforcingAdmin.getActiveAdmin(); admin = enforcingAdmin.getActiveAdmin();
} else { } else {
Objects.requireNonNull(who, "ComponentName is null");
Preconditions.checkCallAuthorization(isDeviceOwner(caller) || isProfileOwner(caller)); Preconditions.checkCallAuthorization(isDeviceOwner(caller) || isProfileOwner(caller));
} }
@@ -17396,6 +17397,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
caller.getUserId()); caller.getUserId());
admin = enforcingAdmin.getActiveAdmin(); admin = enforcingAdmin.getActiveAdmin();
} else { } else {
Objects.requireNonNull(who, "ComponentName is null");
Preconditions.checkCallingUser(isManagedProfile(caller.getUserId())); Preconditions.checkCallingUser(isManagedProfile(caller.getUserId()));
Preconditions.checkCallAuthorization(isDeviceOwner(caller) || isProfileOwner(caller)); Preconditions.checkCallAuthorization(isDeviceOwner(caller) || isProfileOwner(caller));