summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jonathan Scott <scottjonathan@google.com> 2023-02-21 12:49:44 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-02-21 12:49:44 +0000
commit9d0370089f479107bf4a465370cce2f3a366edf6 (patch)
tree43a23d77b77cde279ba00bd497946ed00dabcd01
parentd106e3317842ab83ffeeb066d8334ce8cd39bb94 (diff)
parent933e6503a389b63351cbda922d07c012d19f1983 (diff)
Merge "Remove incorrect checkNotNull." into udc-dev
-rw-r--r--services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 3c3cb2b49ba3..852e7733d9f0 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -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,