From afbbcd9f53aaf95b529cec67307516a55e49e97a Mon Sep 17 00:00:00 2001
From: Sara Kato <sarakato@google.com>
Date: Fri, 25 Dec 2020 13:26:20 +0900
Subject: [PATCH] arc-notifications: Allow app icons to be visible in
 arc-notifications

This was caused by shelf icon visibility being set on an empty row in
NotificationEntry

Test: None
Bug: 171839585
Change-Id: I5ea4ccd34ca489fba6b5a83c39718d0d8bf149d2
---
 .../statusbar/notification/collection/NotificationEntry.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java
index 789e78e336718..bafa4a254d79c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java
@@ -938,6 +938,7 @@ public final class NotificationEntry extends ListEntry {
 
     /** Whether or not the icon for this notification is visible in the shelf. */
     public void setShelfIconVisible(boolean shelfIconVisible) {
+        if (row == null) return;
         mShelfIconVisible = shelfIconVisible;
         updateShelfIconVisibility();
     }