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

1 files changed, 5 insertions, 0 deletions

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java
index 3d5686dfe66e..0868fbea8c1e 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java
@@ -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);