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

Merge "Remove incorrect checkNotNull." into udc-dev am: 9d0370089f

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

Change-Id: I4045d89936e9e8897821cf2b43acc1ccbea969ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jonathan Scott
2023-02-21 13:30:05 +00:00
committed by Automerger Merge Worker
parent 42728c1407 9d0370089f
commit 94f5918459
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11324,7 +11324,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
setBackwardsCompatibleAppRestrictions( setBackwardsCompatibleAppRestrictions(
packageName, restrictions, caller.getUserHandle()); packageName, restrictions, caller.getUserHandle());
} else { } else {
Objects.requireNonNull(who, "ComponentName is null");
Preconditions.checkCallAuthorization((caller.hasAdminComponent() Preconditions.checkCallAuthorization((caller.hasAdminComponent()
&& (isProfileOwner(caller) || isDefaultDeviceOwner(caller))) && (isProfileOwner(caller) || isDefaultDeviceOwner(caller)))
|| (caller.hasPackage() && isCallerDelegate(caller, || (caller.hasPackage() && isCallerDelegate(caller,