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

Change-Id: I160b7a6ec7545c52aa503da56301e1adc77475d3
2020-04-21 10:54:59 +00:00
parent 27bee7bfc5 80057e3a35
commit ca42ac2a0b
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);
            }
        }