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

Commit d6b4a2e0 authored by Rubin Xu's avatar Rubin Xu Committed by Automerger Merge Worker
Browse files

Merge "Fix DefaultSmsApplicationTest for organization-owned profile owner"... 

Merge "Fix DefaultSmsApplicationTest for organization-owned profile owner" into udc-dev am: f750196c am: f1d39280

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



Change-Id: I1c6b9d501fbf3f249a269230af701a315f8ff559
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e66c6042 f1d39280

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