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

Commit f750196c authored by Rubin Xu's avatar Rubin Xu Committed by Android (Google) Code Review
Browse files

Merge "Fix DefaultSmsApplicationTest for organization-owned profile owner" into udc-dev

parents c840f6b9 fb41da46

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

+1 −1
Original line number Diff line number Diff line
@@ -11219,7 +11219,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        } else {

            Objects.requireNonNull(admin, "ComponentName is null");

            Preconditions.checkCallAuthorization(isDefaultDeviceOwner(caller)

                    || (parent && isProfileOwnerOfOrganizationOwnedDevice(caller)));

                    || isProfileOwnerOfOrganizationOwnedDevice(caller));

        }

        if (parent) {

            userId = getProfileParentId(mInjector.userHandleGetCallingUserId());