Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2633e40 authored by Shawn Lee's avatar Shawn Lee Committed by Automerger Merge Worker
Browse files

Merge "Prevent NPE in NPVC when accessing HeadsUpAppearanceController" into udc-dev am: 4ccef5d1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23091745



Change-Id: I3f84b73c674efd4b410c3aadb99bc028373e058c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a0cbcf65 4ccef5d1

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+2 −1
Original line number Diff line number Diff line
@@ -4373,7 +4373,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 


                @Override

                public boolean shouldHeadsUpBeVisible() {

                    return mHeadsUpAppearanceController.shouldBeVisible();

                    return mHeadsUpAppearanceController != null &&

                            mHeadsUpAppearanceController.shouldBeVisible();

                }



                @Override