Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 712aeef3 authored by Jonathan Scott's avatar Jonathan Scott Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I09007d040ae234c7750f468989771ea1e9b33d3e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5d6c5577 9d037008

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+0 −1
Original line number Diff line number Diff line
@@ -11324,7 +11324,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            setBackwardsCompatibleAppRestrictions(

                    packageName, restrictions, caller.getUserHandle());

        } else {

            Objects.requireNonNull(who, "ComponentName is null");

            Preconditions.checkCallAuthorization((caller.hasAdminComponent()

                    && (isProfileOwner(caller) || isDefaultDeviceOwner(caller)))

                    || (caller.hasPackage() && isCallerDelegate(caller,