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

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

Merge "Fixed a crash with the autocancelling" into nyc-dev am: 4a4b76f6 

am: d4962867

* commit 'd4962867':
  Fixed a crash with the autocancelling

Change-Id: I031b0c3ca48f93a4705d8dfd58c7b263e1e1953d
parents a11bd4cd d4962867

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

+10 −4
Original line number Original line Diff line number Diff line
@@ -215,17 +215,23 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged 




    public boolean isOnlyChildInSuppressedGroup(StatusBarNotification sbn) {

    public boolean isOnlyChildInSuppressedGroup(StatusBarNotification sbn) {

        return isGroupSuppressed(sbn.getGroupKey())

        return isGroupSuppressed(sbn.getGroupKey())

                && isOnlyChildInGroup(sbn);

                && isOnlyChild(sbn);

    }

    }





    public boolean isOnlyChildInGroup(StatusBarNotification sbn) {

    private boolean isOnlyChild(StatusBarNotification sbn) {

        return !sbn.getNotification().isGroupSummary()

        return !sbn.getNotification().isGroupSummary()

                && getTotalNumberOfChildren(sbn) == 1;

                && getTotalNumberOfChildren(sbn) == 1;

    }

    }





    public boolean isOnlyChildInGroup(StatusBarNotification sbn) {

        return isOnlyChild(sbn) && getLogicalGroupSummary(sbn) != null;

    }



    private int getTotalNumberOfChildren(StatusBarNotification sbn) {

    private int getTotalNumberOfChildren(StatusBarNotification sbn) {

        return getNumberOfIsolatedChildren(sbn.getGroupKey())

        int isolatedChildren = getNumberOfIsolatedChildren(sbn.getGroupKey());

                + mGroupMap.get(sbn.getGroupKey()).children.size();

        NotificationGroup group = mGroupMap.get(sbn.getGroupKey());

        int realChildren = group != null ? group.children.size() : 0;

        return isolatedChildren + realChildren;

    }

    }





    private boolean isGroupSuppressed(String groupKey) {

    private boolean isGroupSuppressed(String groupKey) {