Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c007528 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Allow financed DOs to set LOCK_TASK_FEATURE_NONE" into udc-dev am: 59f3781c am: b064c156"
parents cf8cd936 8e822080

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -15139,7 +15139,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, "