diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java index 93204995c5b0e..5cee5bd0cc4ea 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java @@ -1340,8 +1340,11 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable @ShadeViewRefactor(RefactorComponent.COORDINATOR) private float getAppearStartPosition() { if (isHeadsUpTransition()) { - return mHeadsUpInset - + getFirstVisibleSection().getFirstVisibleChild().getPinnedHeadsUpHeight(); + final NotificationSection firstVisibleSection = getFirstVisibleSection(); + final int pinnedHeight = firstVisibleSection != null + ? firstVisibleSection.getFirstVisibleChild().getPinnedHeadsUpHeight() + : 0; + return mHeadsUpInset + pinnedHeight; } return getMinExpansionHeight(); }