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

Commit e291612d authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fixed a leak of a notification when replying to a conversation"...

Merge "Merge "Fixed a leak of a notification when replying to a conversation" into pi-dev am: ccefa79c am: 14735047"
parents b960060f 25cd9cc1
Loading
Loading
Loading
Loading
+9 −3
Original line number Diff line number Diff line
@@ -678,9 +678,15 @@ public class NotificationEntryManager implements Dumpable, NotificationInflater.
                    entry.row.getNotificationChildren();
            for (int i = 0; i < notificationChildren.size(); i++) {
                ExpandableNotificationRow row = notificationChildren.get(i);
                if ((row.getStatusBarNotification().getNotification().flags
                        & Notification.FLAG_FOREGROUND_SERVICE) != 0) {
                    // the child is a foreground service notification which we can't remove!
                NotificationData.Entry childEntry = row.getEntry();
                boolean isForeground = (row.getStatusBarNotification().getNotification().flags
                        & Notification.FLAG_FOREGROUND_SERVICE) != 0;
                boolean keepForReply = FORCE_REMOTE_INPUT_HISTORY
                        && (shouldKeepForRemoteInput(childEntry)
                                || shouldKeepForSmartReply(childEntry));
                if (isForeground || keepForReply) {
                    // the child is a foreground service notification which we can't remove or it's
                    // a child we're keeping around for reply!
                    continue;
                }
                row.setKeepInParent(true);