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

Commit 73cf2d57 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed a concurrent modification crash" into nyc-dev am: f9f48ecd am: b524962d 

am: 8a45bc04

* commit '8a45bc04':
  Fixed a concurrent modification crash

Change-Id: Ied7cbc34431d317fecf73cff3c734901fc8b4bee
parents d27f3c92 8a45bc04

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java

+7 −1
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ import com.android.systemui.statusbar.policy.HeadsUpManager; 




import java.io.FileDescriptor;

import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.HashMap;

import java.util.HashSet;

import java.util.HashSet;

import java.util.Iterator;

import java.util.Iterator;
@@ -239,7 +240,12 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged 
    }

    }





    public void collapseAllGroups() {

    public void collapseAllGroups() {

        for (NotificationGroup group : mGroupMap.values()) {

        // Because notifications can become isolated when the group becomes suppressed it can

        // lead to concurrent modifications while looping. We need to make a copy.

        ArrayList<NotificationGroup> groupCopy = new ArrayList<>(mGroupMap.values());

        int size = groupCopy.size();

        for (int i = 0; i < size; i++) {

            NotificationGroup group =  groupCopy.get(i);

            if (group.expanded) {

            if (group.expanded) {

                setGroupExpanded(group, false);

                setGroupExpanded(group, false);

            }

            }