Merge "Prevent NPE in NPVC when accessing HeadsUpAppearanceController" into udc-dev

2023-05-09 17:26:34 +00:00
parent 0fa26314fe 6a1df8334e
commit 4ccef5d179
1 changed files with 2 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
@@ -4373,7 +4373,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump

                @Override
                public boolean shouldHeadsUpBeVisible() {
-                    return mHeadsUpAppearanceController.shouldBeVisible();
+                    return mHeadsUpAppearanceController != null &&
+                            mHeadsUpAppearanceController.shouldBeVisible();
                }

                @Override