Fix NPE when removing policies.

Test: atest
android.app.cts.ActivityManagerTest#testTimeTrackingAPI_SimpleStartExit
Fixes: 277978314

Change-Id: I305af84c0fbdffbbcb1f34b1d50ab03476a2e530
This commit is contained in:
Jonathan Scott
2023-04-13 08:16:23 +00:00
parent 54f6fb6dc6
commit cab2f5bd57

View File

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