Merge "Fix HUN unbind crash when notif is removed." into rvc-dev am: 80057e3a35 am: ca42ac2a0b

Change-Id: Id79486d25c8311b4897ee4ce277f5d84f8353a7b
2020-04-21 11:03:23 +00:00
parent 4a96cad599 ca42ac2a0b
commit a107190297
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/HeadsUpController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/HeadsUpController.java
@@ -175,7 +175,7 @@ public class HeadsUpController {
    private OnHeadsUpChangedListener mOnHeadsUpChangedListener  = new OnHeadsUpChangedListener() {
        @Override
        public void onHeadsUpStateChanged(@NonNull NotificationEntry entry, boolean isHeadsUp) {
-            if (!isHeadsUp) {
+            if (!isHeadsUp && !entry.getRow().isRemoved()) {
                mHeadsUpViewBinder.unbindHeadsUpView(entry);
            }
        }