From 68e79c73569c6744f2bfd48563ff90f84510e4f7 Mon Sep 17 00:00:00 2001
From: Jay Aliomer <aaliomer@google.com>
Date: Thu, 1 Apr 2021 15:38:35 -0400
Subject: [PATCH] Group notification time bug

Fixes: b/182160998
Test: Notify app
Change-Id: Id0147be59524879fb94cea7ccfb1c0202490c460
---
 .../statusbar/NotificationGroupingUtil.java      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGroupingUtil.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGroupingUtil.java
index e090d0b132055..1c5df4119a24b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGroupingUtil.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGroupingUtil.java
@@ -161,22 +161,22 @@ public class NotificationGroupingUtil {
 
     private void sanitizeTopLineViews(ExpandableNotificationRow row) {
         if (row.isSummaryWithChildren()) {
-            sanitizeTopLine(row.getNotificationViewWrapper().getNotificationHeader());
+            sanitizeTopLine(row.getNotificationViewWrapper().getNotificationHeader(), row);
             return;
         }
         final NotificationContentView layout = row.getPrivateLayout();
-        sanitizeChild(layout.getContractedChild());
-        sanitizeChild(layout.getHeadsUpChild());
-        sanitizeChild(layout.getExpandedChild());
+        sanitizeChild(layout.getContractedChild(), row);
+        sanitizeChild(layout.getHeadsUpChild(), row);
+        sanitizeChild(layout.getExpandedChild(), row);
     }
 
-    private void sanitizeChild(View child) {
+    private void sanitizeChild(View child, ExpandableNotificationRow row) {
         if (child != null) {
-            sanitizeTopLine(child.findViewById(R.id.notification_top_line));
+            sanitizeTopLine(child.findViewById(R.id.notification_top_line), row);
         }
     }
 
-    private void sanitizeTopLine(ViewGroup rowHeader) {
+    private void sanitizeTopLine(ViewGroup rowHeader, ExpandableNotificationRow row) {
         if (rowHeader == null) {
             return;
         }
@@ -195,7 +195,7 @@ public class NotificationGroupingUtil {
         }
         // in case no view is visible we make sure the time is visible
         int timeVisibility = !hasVisibleText
-                || mRow.getEntry().getSbn().getNotification().showsTime()
+                || row.getEntry().getSbn().getNotification().showsTime()
                 ? View.VISIBLE : View.GONE;
         time.setVisibility(timeVisibility);
         View left = null;