Merge "Removing notifications that were kept around longer on click" into pi-dev

2018-05-17 01:35:27 +00:00
parent 25e3827517 6241243ddf
commit 88bac47c75
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -5160,7 +5160,9 @@ public class StatusBar extends SystemUI implements DemoMode,
                if (parentToCancelFinal != null) {
                    removeNotification(parentToCancelFinal);
                }
-                if (shouldAutoCancel(sbn)) {
+                if (shouldAutoCancel(sbn)
+                        || mRemoteInputManager.getKeysKeptForRemoteInput().contains(
+                                notificationKey)) {
                    // Automatically remove all notifications that we may have kept around longer
                    removeNotification(sbn);
                }