Merge "Check for Shelf icon Nullness."

2022-01-21 19:59:01 +00:00
parent 77c9957ab4 15f3679b3b
commit 01bfee506c
1 changed files with 3 additions and 0 deletions
--- 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 */,