Merge "Fix memory leak for test where shade is not closed" into main (b351e733) · Commits · e / os / android_frameworks_base

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() {