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

Commit cc3a74b4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 86a02228 3cad2606

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.