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

Commit abe0cd49 authored by Kholoud Mohamed's avatar Kholoud Mohamed
Browse files

Fix bug in isManagedKiosk

Fixes: 279567430
Test: atest com.google.android.gts.devicepolicy.DeviceOwnerTest#testIsManagedKiosk_lockTaskSystemInfoFeature_returnsFalse
Change-Id: I29e63ef20571f1d29cd7372ab068567da62c1e5d
parent 29ddb4d3
Loading
Loading
Loading
Loading
+14 −3
Original line number Diff line number Diff line
@@ -20156,9 +20156,20 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
    }
    private boolean isLockTaskFeatureEnabled(int lockTaskFeature) throws RemoteException {
        int lockTaskFeatures = 0;
        if (isPolicyEngineForFinanceFlagEnabled()) {
            LockTaskPolicy policy = mDevicePolicyEngine.getResolvedPolicy(
                    PolicyDefinition.LOCK_TASK, getCurrentForegroundUserId());
            lockTaskFeatures = policy == null
                    // We default on the power button menu, in order to be consistent with pre-P
                    // behaviour.
                    ? DevicePolicyManager.LOCK_TASK_FEATURE_GLOBAL_ACTIONS
                    : policy.getFlags();
        } else {
            //TODO(b/175285301): Explicitly get the user's identity to check.
        int lockTaskFeatures =
            lockTaskFeatures =
                    getUserData(getCurrentForegroundUserId()).mLockTaskFeatures;
        }
        return (lockTaskFeatures & lockTaskFeature) == lockTaskFeature;
    }