Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I4d3ce838feec5cca1e12458de94db50e8d20c4c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kholoud Mohamed
2023-05-12 10:17:59 +00:00
committed by Automerger Merge Worker
parent c1357aebae 59f3781cde
commit 5a1258907f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -15135,7 +15135,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
return; return;
} }
if ((flags == 0) || ((flags & ~(allowedFlags)) != 0)) { if ((flags & ~(allowedFlags)) != 0) {
throw new SecurityException( throw new SecurityException(
"Permitted lock task features when managing a financed device: " "Permitted lock task features when managing a financed device: "
+ "LOCK_TASK_FEATURE_SYSTEM_INFO, LOCK_TASK_FEATURE_KEYGUARD, " + "LOCK_TASK_FEATURE_SYSTEM_INFO, LOCK_TASK_FEATURE_KEYGUARD, "