From fb41da4662f71e787c7100ef4388f67da9cec37a Mon Sep 17 00:00:00 2001
From: Rubin Xu <rubinxu@google.com>
Date: Mon, 6 Mar 2023 21:20:34 +0000
Subject: [PATCH] Fix DefaultSmsApplicationTest for organization-owned profile
 owner

Bug: 270614236
Fix: 270614236
Test: DefaultSmsApplicationTest
Change-Id: Ieee2f12f7e786588aeec679e97be7f2179baa032
---
 .../android/server/devicepolicy/DevicePolicyManagerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index bfcb4c7b6bc0f..d3cfb9d80b3cc 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -11196,7 +11196,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());