Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48eb3702 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed a bug where a notification could be stuck in the overlay" into nyc-dev 

am: 2fba2291

* commit '2fba2291':
  Fixed a bug where a notification could be stuck in the overlay

Change-Id: I3ad2960fe0c077b7db539ac094269034c4558757
parents 8c8ea506 2fba2291

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+4 −1
Original line number Diff line number Diff line
@@ -1887,10 +1887,13 @@ public abstract class BaseStatusBar extends SystemUI implements 
                public boolean onDismiss() {

                    if (mHeadsUpManager != null && mHeadsUpManager.isHeadsUp(notificationKey)) {

                        // Release the HUN notification to the shade.



                        if (isPanelFullyCollapsed()) {

                            HeadsUpManager.setIsClickedNotification(row, true);

                        }

                        //

                        // In most cases, when FLAG_AUTO_CANCEL is set, the notification will

                        // become canceled shortly by NoMan, but we can't assume that.

                        HeadsUpManager.setIsClickedNotification(row, true);

                        mHeadsUpManager.releaseImmediately(notificationKey);

                    }

                    StatusBarNotification parentToCancel = null;