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

Commit d85d573d authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix java.util.ConcurrentModificationException" into main

parents 9b228159 765d7507

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

+2 −2
Original line number Diff line number Diff line
@@ -1961,8 +1961,8 @@ final class DevicePolicyEngine { 
            return;

        }

        String roleAuthority = EnforcingAdmin.getRoleAuthorityOf(roleName);

        Set<EnforcingAdmin> admins = getEnforcingAdminsOnUser(userId);

        for (EnforcingAdmin admin : admins) {

        List<EnforcingAdmin> adminslist = new ArrayList<>(getEnforcingAdminsOnUser(userId));

        for (EnforcingAdmin admin : adminslist) {

            if (admin.hasAuthority(roleAuthority)) {

                admin.reloadRoleAuthorities();

                // remove admin policies if role was lost