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

2023-03-09 11:06:34 +00:00
parent c840f6b922 fb41da4662
commit f750196ca6
1 changed files with 1 additions and 1 deletions
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -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());