am 73500edb: Merge "SysUI: Don\'t drop HUN notification when clicked" into lmp-mr1-dev

automerge: 9e9885e

* commit '9e9885e1c0b34a6284235e61b023013c1ded6468':
  SysUI: Don't drop HUN notification when clicked

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