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

Commit d5842c6f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

parents f76eaf9a cfa3bbaa

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