From c6a656c9ab45eb0c9ace391fbd9534bc57341d27 Mon Sep 17 00:00:00 2001
From: Christoph Studer <chstuder@google.com>
Date: Thu, 22 Jan 2015 15:02:49 +0100
Subject: [PATCH] SysUI: Don't drop HUN notification when clicked

A clicked notification is not guaranteed to be removed,
so instead of dropping a clicked HUN notification we have
to release it to the shade.

Bug: 19093631
Change-Id: I73b88af774e49e89c8a601873c48cc5f5eed0224
---
 .../src/com/android/systemui/statusbar/BaseStatusBar.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
index 2b6ac26fc2abf..3392d8eab8981 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@ -1549,7 +1549,11 @@ public abstract class BaseStatusBar extends SystemUI implements
             dismissKeyguardThenExecute(new OnDismissAction() {
                 public boolean onDismiss() {
                     if (mIsHeadsUp) {
-                        mHeadsUpNotificationView.clear();
+                        // Release the HUN notification to the shade.
+                        //
+                        // In most cases, when FLAG_AUTO_CANCEL is set, the notification will
+                        // become canceled shortly by NoMan, but we can't assume that.
+                        mHeadsUpNotificationView.releaseAndClose();
                     }
                     new Thread() {
                         @Override