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

Commit 1d2b8914 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 am: d5842c6f 

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



Change-Id: Id0f69f04faebfab71064815676c841e1a6e0d8ca
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d8b5160 d5842c6f

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

+2 −0
Original line number Diff line number Diff line
@@ -17365,6 +17365,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));

        }










@@ -17396,6 +17397,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));