Merge "Allow financed DOs to set LOCK_TASK_FEATURE_NONE" into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
59f3781cde
@@ -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, "
|
||||||
|
|||||||
Reference in New Issue
Block a user