Merge "Merge "Re-add ComponentName null check for setOrganisationName." into... (404ae0db) · Commits · e / os / android_frameworks_base

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -17362,6 +17362,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));
		}

		@@ -17393,6 +17394,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));