Merge "Allow financed DOs to set LOCK_TASK_FEATURE_NONE" into udc-dev

2023-05-12 10:01:13 +00:00
parent 55e23e0ff9 6676adcdd2
commit 59f3781cde
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
@@ -15135,7 +15135,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, "