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

Commit fa26f4c6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ide507b64cf9eb7457ded8ad58a4d01f454bf8df8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fe672128 cc3a74b4

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

+2 −2
Original line number Diff line number Diff line
@@ -14725,7 +14725,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        }















        final int userId = mInjector.userHandleGetCallingUserId();













        if (isPermissionCheckFlagEnabled()) {













        if (isPolicyEngineForFinanceFlagEnabled()) {















            LockTaskPolicy policy = mDevicePolicyEngine.getResolvedPolicy(















                    PolicyDefinition.LOCK_TASK, userId);















            if (policy == null) {

























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



+3
−3




























File changed.
Contains only whitespace changes.