From 6676adcdd261a5e074def61a77ba65a78238b821 Mon Sep 17 00:00:00 2001 From: Kholoud Mohamed Date: Thu, 11 May 2023 16:12:33 +0000 Subject: [PATCH] Allow financed DOs to set LOCK_TASK_FEATURE_NONE Bug: 282010068 Test: btest android.devicepolicy.cts.LockTaskTest Change-Id: Iffc2334d8185c1dcf2c9650c4be1cc2410b8717f --- .../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 ef45ceedb7f27..8d5a013cc6f75 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -15129,7 +15129,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { return; } - if ((flags == 0) || ((flags & ~(allowedFlags)) != 0)) { + if ((flags & ~(allowedFlags)) != 0) { throw new SecurityException( "Permitted lock task features when managing a financed device: " + "LOCK_TASK_FEATURE_SYSTEM_INFO, LOCK_TASK_FEATURE_KEYGUARD, "