From 15f3679b3be84a36630f73d30bc8be4a035319c5 Mon Sep 17 00:00:00 2001
From: Ben Lin <linben@google.com>
Date: Thu, 20 Jan 2022 19:14:36 -0800
Subject: [PATCH] Check for Shelf icon Nullness.

It's possible for it to be null, from other checks in the code.

Bug: None
Test: Build
Change-Id: I2b9c46690b608a97f6e323c3060641d1fda13c5d
---
 .../statusbar/phone/NotificationIconAreaController.java        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java
index 5d6e807729faa..aff73e456b2e3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java
@@ -349,6 +349,9 @@ public class NotificationIconAreaController implements
     }
 
     private void updateShelfIcons() {
+        if (mShelfIcons == null) {
+            return;
+        }
         updateIconsForLayout(entry -> entry.getIcons().getShelfIcon(), mShelfIcons,
                 true /* showAmbient */,
                 true /* showLowPriority */,