From cfa3bbaac68d35ac2509dd174bb4bb5b466691fa Mon Sep 17 00:00:00 2001 From: Elis Elliott Date: Wed, 12 Apr 2023 14:08:18 +0000 Subject: Re-add ComponentName null check for setOrganisationName. For the legacy-code only. Fixes: 269138919 Test: atest com.android.cts.devicepolicy.ManagedProfileTest#testOrganizationInfo Change-Id: Ic033cb5820d48135c926316e9672f301eb3185a8 --- .../com/android/server/devicepolicy/DevicePolicyManagerService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 94e6e732dd76..20c7242997b4 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -17324,6 +17324,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)); } @@ -17355,6 +17356,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)); -- cgit v1.2.3-59-g8ed1b