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

Commit f4607ec5 authored by Lyn's avatar Lyn
Browse files

Fix memory leak for test where shade is not closed 

Fixes: 371184919
Test: manual logs confirm removal from list when notif is removed
Flag: com.android.systemui.notification_avalanche_throttle_hun
Change-Id: I50a0b8ed5eded9f478c7bb708d23e8cc25a566ec
parent 86fe22cd

packages/SystemUI/src/com/android/systemui/statusbar/notification/HeadsUpManagerPhone.java

+8 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ public class HeadsUpManagerPhone extends BaseHeadsUpManager implements 
        }

        mAnimationStateHandler.setHeadsUpGoingAwayAnimationsAllowed(false);

        for (NotificationEntry entry : mEntriesToRemoveWhenReorderingAllowed) {

            if (isHeadsUpEntry(entry.getKey())) {

            if (entry != null && isHeadsUpEntry(entry.getKey())) {

                // Maybe the heads-up was removed already

                removeEntry(entry.getKey(), "mOnReorderingAllowedListener");

            }
@@ -488,6 +488,13 @@ public class HeadsUpManagerPhone extends BaseHeadsUpManager implements 
        }

        updateTopHeadsUpFlow();

        updateHeadsUpFlow();

        if (NotificationThrottleHun.isEnabled()) {

            if (headsUpEntry.mEntry != null) {

                if (mEntriesToRemoveWhenReorderingAllowed.contains(headsUpEntry.mEntry)) {

                    mEntriesToRemoveWhenReorderingAllowed.remove(headsUpEntry.mEntry);

                }

            }

        }

    }



    private void updateTopHeadsUpFlow() {