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

Merge "Use Correct feature flag for isLockTaskPermitted" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-04-13 12:09:00 +00:00
committed by Android (Google) Code Review
parent 86a02228f6 3cad2606a8
commit cc3a74b4b3
2 changed files with 5 additions and 5 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

@@ -14725,7 +14725,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
} }
final int userId = mInjector.userHandleGetCallingUserId(); final int userId = mInjector.userHandleGetCallingUserId();
if (isPermissionCheckFlagEnabled()) { if (isPolicyEngineForFinanceFlagEnabled()) {
LockTaskPolicy policy = mDevicePolicyEngine.getResolvedPolicy( LockTaskPolicy policy = mDevicePolicyEngine.getResolvedPolicy(
PolicyDefinition.LOCK_TASK, userId); PolicyDefinition.LOCK_TASK, userId);
if (policy == null) { if (policy == null) {