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

Merge "Fix NPE when removing policies." into udc-dev

Browse Source
This commit is contained in:
Jonathan Scott
2023-04-13 11:04:26 +00:00
committed by Android (Google) Code Review
parent b2ec965f71 cab2f5bd57
commit f76eaf9aa3
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java
View File

@@ -1066,6 +1066,11 @@ final class DevicePolicyEngine {
* Removes all local policies for the provided {@code userId}. * Removes all local policies for the provided {@code userId}.
*/ */
private void removeLocalPoliciesForUser(int userId) { private void removeLocalPoliciesForUser(int userId) {
if (!mLocalPolicies.contains(userId)) {
// No policies on user
return;
}
Set<PolicyKey> localPolicies = new HashSet<>(mLocalPolicies.get(userId).keySet()); Set<PolicyKey> localPolicies = new HashSet<>(mLocalPolicies.get(userId).keySet());
for (PolicyKey policy : localPolicies) { for (PolicyKey policy : localPolicies) {
PolicyState<?> policyState = mLocalPolicies.get(userId).get(policy); PolicyState<?> policyState = mLocalPolicies.get(userId).get(policy);