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

Commit d7f078c2 authored by Yvonne Jiang's avatar Yvonne Jiang
Browse files

Revert policy looping logic back to iterating over copy of PolicyKeys instead... 

Revert policy looping logic back to iterating over copy of PolicyKeys instead of directly on the values.

Changes made in I3daf12ee9eaebd28b187a6ff03b7134127010f34 accidentally
resulted in a ConcurrentModificationException.

Test: atest SupervisionServiceTest
Test: manual
Bug: 434981305
Flag: android.app.supervision.flags.supervision_manager_apis
Change-Id: I5999a3b96e706f5a67fcce7516d23617bf6e1921
parent 2647e892

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

+6 −2
Original line number Diff line number Diff line
@@ -2081,7 +2081,9 @@ final class DevicePolicyEngine { 
     */

    void removePoliciesForAdmins(@UserIdInt int userId, List<String> packageNames) {

        synchronized (mLock) {

            for (PolicyState<?> policyState : mGlobalPolicies.values()) {

            Set<PolicyKey> globalPolicies = new HashSet<>(mGlobalPolicies.keySet());

            for (PolicyKey policy : globalPolicies) {

                PolicyState<?> policyState = mGlobalPolicies.get(policy);

                for (EnforcingAdmin admin : policyState.getPoliciesSetByAdmins().keySet()) {

                    if (packageNames.contains(admin.getPackageName())

                            && admin.getUserId() == userId) {
@@ -2116,7 +2118,9 @@ final class DevicePolicyEngine { 
    void removeLocalPoliciesForAdminsLocked(

            @UserIdInt int userId, Predicate<EnforcingAdmin> adminPredicate) {

        if (mLocalPolicies.containsKey(userId)) {

            for (PolicyState<?> policyState : mLocalPolicies.get(userId).values()) {

            Set<PolicyKey> localPolicies = new HashSet<>(mLocalPolicies.get(userId).keySet());

            for (PolicyKey policy : localPolicies) {

                PolicyState<?> policyState = mLocalPolicies.get(userId).get(policy);

                for (EnforcingAdmin admin : policyState.getPoliciesSetByAdmins().keySet()) {

                    if (adminPredicate.test(admin)) {

                        CompletableFuture<Integer> unused =