Merge "Prevent NPE in NPVC when accessing HeadsUpAppearanceController" into udc-dev am: 4ccef5d179
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23091745 Change-Id: I42c66d21c7dd232777ca394c29be75d5ccdef306 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -4373,7 +4373,8 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
|
||||
|
||||
@Override
|
||||
public boolean shouldHeadsUpBeVisible() {
|
||||
return mHeadsUpAppearanceController.shouldBeVisible();
|
||||
return mHeadsUpAppearanceController != null &&
|
||||
mHeadsUpAppearanceController.shouldBeVisible();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user