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

Commit 225b7e08 authored by Jonathan Scott's avatar Jonathan Scott Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22616876



Change-Id: I9134dc7d5362715af78c5de518f74bf4729f331c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 90210c01 f76eaf9a

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java

+5 −0
Original line number Diff line number Diff line
@@ -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);