From 8c796fee9ef54171b51c5427bce724353104fee4 Mon Sep 17 00:00:00 2001
From: Jason Parks <jparks@google.com>
Date: Fri, 31 Mar 2023 18:06:45 +0000
Subject: [PATCH] Combine the checks for DO/PO in
 isAdminAffectedByRestriction().

Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testCreateAndManageUser_RemoveRestrictionSet
Bug: 270045994
Change-Id: If0b600d180a2219ee81ed9c682a84158e222da5c
---
 .../server/devicepolicy/DevicePolicyManagerService.java        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 770e728ba9353..d82881328b3fe 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -12519,9 +12519,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
             case UserManager.RESTRICTION_NOT_SET:
                 return false;
             case UserManager.RESTRICTION_SOURCE_DEVICE_OWNER:
-                return !isDeviceOwner(admin, userId);
             case UserManager.RESTRICTION_SOURCE_PROFILE_OWNER:
-                return !isProfileOwner(admin, userId);
+                return !(isDeviceOwner(admin, userId) || isProfileOwner(admin, userId));
             default:
                 return true;
         }