Merge "Return early if there are no entries to remove" into main (4d1af3ab) · Commits · e / os / android_frameworks_base

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -389,10 +389,13 @@ public class HeadsUpManagerPhone extends BaseHeadsUpManager implements
		// OnReorderingAllowedListener:

		private final OnReorderingAllowedListener mOnReorderingAllowedListener = () -> {
		mAnimationStateHandler.setHeadsUpGoingAwayAnimationsAllowed(false);
		if (NotificationThrottleHun.isEnabled()) {
		mAvalancheController.setEnableAtRuntime(true);
		if (mEntriesToRemoveWhenReorderingAllowed.isEmpty()) {
		return;
		}
		}
		mAnimationStateHandler.setHeadsUpGoingAwayAnimationsAllowed(false);
		for (NotificationEntry entry : mEntriesToRemoveWhenReorderingAllowed) {
		if (isHeadsUpEntry(entry.getKey())) {
		// Maybe the heads-up was removed already