diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/notification/HeadsUpManagerPhone.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/HeadsUpManagerPhone.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/HeadsUpManagerPhone.java index fb42bad7033d..0299ebcdf043 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/HeadsUpManagerPhone.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/HeadsUpManagerPhone.java @@ -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() { |