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

Commit 1d23cdba authored by András Kurucz's avatar András Kurucz
Browse files

[flexiglass] Verify that NSSL#mMaxTopPadding is not accessed 

Bug: 296118689
Test: run sysui with, and without flexiglass
Flag: EXEMPT mechanical refactor
Change-Id: Ic9265fc6a4a8df28a18c41850b2ae985e5b67511
parent 10330454

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+13 −7
Original line number Diff line number Diff line
@@ -1694,7 +1694,7 @@ public class NotificationStackScrollLayout 
            } else if (mQsFullScreen) {

                int stackStartPosition =

                        getContentHeight() - getTopPadding() + getIntrinsicPadding();

                int stackEndPosition = mMaxTopPadding + mShelf.getIntrinsicHeight();

                int stackEndPosition = getMaxTopPadding() + mShelf.getIntrinsicHeight();

                if (stackStartPosition <= stackEndPosition) {

                    stackHeight = stackEndPosition;

                } else {
@@ -2851,11 +2851,6 @@ public class NotificationStackScrollLayout 
        setExpandedHeight(mExpandedHeight);

    }



    public void setMaxTopPadding(int maxTopPadding) {

        SceneContainerFlag.assertInLegacyMode();

        mMaxTopPadding = maxTopPadding;

    }



    public int getLayoutMinHeight() {

        SceneContainerFlag.assertInLegacyMode();

        return getLayoutMinHeightInternal();
@@ -5514,7 +5509,6 @@ public class NotificationStackScrollLayout 
            println(pw, "alpha", getAlpha());

            println(pw, "suppressChildrenMeasureLayout", mSuppressChildrenMeasureAndLayout);

            println(pw, "scrollY", mAmbientState.getScrollY());

            println(pw, "maxTopPadding", mMaxTopPadding);

            println(pw, "showShelfOnly", mShouldShowShelfOnly);

            println(pw, "qsExpandFraction", mQsExpansionFraction);

            println(pw, "isCurrentUserSetup", mIsCurrentUserSetup);
@@ -5551,6 +5545,7 @@ public class NotificationStackScrollLayout 
                println(pw, "intrinsicContentHeight", getIntrinsicContentHeight());

                println(pw, "contentHeight", getContentHeight());

                println(pw, "topPadding", getTopPadding());

                println(pw, "maxTopPadding", getMaxTopPadding());

            }

        });

        pw.println();
@@ -6979,4 +6974,15 @@ public class NotificationStackScrollLayout 
        SceneContainerFlag.assertInLegacyMode();

        mIntrinsicContentHeight = intrinsicContentHeight;

    }



    private int getMaxTopPadding() {

        SceneContainerFlag.assertInLegacyMode();

        return mMaxTopPadding;

    }



    /** Not used with SceneContainerFlag, because we rely on the placeholder for placement. */

    public void setMaxTopPadding(int maxTopPadding) {

        SceneContainerFlag.assertInLegacyMode();

        mMaxTopPadding = maxTopPadding;

    }

}