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

Merge "Fix lock task clearing for affiliated users" into udc-dev

Browse Source
This commit is contained in:
Kholoud Mohamed
2023-04-24 14:48:58 +00:00
committed by Android (Google) Code Review
parent 0008bee5a3 c7fc36a82c
commit 029eb856a3
1 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14957,18 +14957,34 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
continue; continue;
} }
final List<String> lockTaskPackages = getUserData(userId).mLockTaskPackages; if (isPolicyEngineForFinanceFlagEnabled()) {
// TODO(b/278438525): handle in the policy engine Map<EnforcingAdmin, PolicyValue<LockTaskPolicy>> policies =
if (!lockTaskPackages.isEmpty()) { mDevicePolicyEngine.getLocalPoliciesSetByAdmins(
Slogf.d(LOG_TAG, PolicyDefinition.LOCK_TASK, userId);
"User id " + userId + " not affiliated. Clearing lock task packages"); Set<EnforcingAdmin> admins = new HashSet<>(policies.keySet());
setLockTaskPackagesLocked(userId, Collections.<String>emptyList()); for (EnforcingAdmin admin : admins) {
} if (admin.hasAuthority(EnforcingAdmin.DPC_AUTHORITY)) {
final int lockTaskFeatures = getUserData(userId).mLockTaskFeatures; mDevicePolicyEngine.removeLocalPolicy(
if (lockTaskFeatures != DevicePolicyManager.LOCK_TASK_FEATURE_NONE){ PolicyDefinition.LOCK_TASK, admin, userId);
Slogf.d(LOG_TAG, }
"User id " + userId + " not affiliated. Clearing lock task features"); }
setLockTaskFeaturesLocked(userId, DevicePolicyManager.LOCK_TASK_FEATURE_NONE); } else {
final List<String> lockTaskPackages = getUserData(userId).mLockTaskPackages;
// TODO(b/278438525): handle in the policy engine
if (!lockTaskPackages.isEmpty()) {
Slogf.d(LOG_TAG,
"User id " + userId
+ " not affiliated. Clearing lock task packages");
setLockTaskPackagesLocked(userId, Collections.<String>emptyList());
}
final int lockTaskFeatures = getUserData(userId).mLockTaskFeatures;
if (lockTaskFeatures != DevicePolicyManager.LOCK_TASK_FEATURE_NONE) {
Slogf.d(LOG_TAG,
"User id " + userId
+ " not affiliated. Clearing lock task features");
setLockTaskFeaturesLocked(userId,
DevicePolicyManager.LOCK_TASK_FEATURE_NONE);
}
} }
} }
}); });