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

Commit 367f8437 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Re-add ComponentName null check for setOrganisationName." into udc-dev... 

Merge "Re-add ComponentName null check for setOrganisationName." into udc-dev am: d5842c6f am: 1d2b8914

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



Change-Id: I98d7e1d52c04ffbbfce2a6c930bbc2df120475f5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d12e7c0 1d2b8914

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));