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

Commit 7894a3df authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Automerger Merge Worker
Browse files

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

Merge "Allow financed DOs to set LOCK_TASK_FEATURE_NONE" into udc-dev am: 59f3781c am: 5a125890 am: 96a9c0ba

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23152366



Change-Id: I064539692bc391cfa6c7d35839882b7a05534af6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e5158baf 96a9c0ba

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

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