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

Merge "Fix bug in isManagedKiosk" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-04-25 16:36:18 +00:00
committed by Android (Google) Code Review
parent 8178b08190 abe0cd49d1
commit 8e71260236
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -20215,9 +20215,20 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
}
private boolean isLockTaskFeatureEnabled(int lockTaskFeature) throws RemoteException {
//TODO(b/175285301): Explicitly get the user's identity to check.
int lockTaskFeatures =
getUserData(getCurrentForegroundUserId()).mLockTaskFeatures;
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.
lockTaskFeatures =
getUserData(getCurrentForegroundUserId()).mLockTaskFeatures;
}
return (lockTaskFeatures & lockTaskFeature) == lockTaskFeature;
}