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

Commit 10330454 authored by András Kurucz's avatar András Kurucz
Browse files

[flexiglass] Verify that NSSL#mContentHeight is not accessed 

NSSL#mContentHeight is replaced by ScrollViewFields#.intrinsicStackHeight when flexiglass is enabled.

Bug: 296118689
Fixes: 376018224
Test: run sysui with, and without flexiglass
Flag: EXEMPT mechanical refactor
Change-Id: I48f03b642c5061731434faae843a51ae1e954220
parent 665593ae

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

+4 −0
Original line number Diff line number Diff line
@@ -6957,10 +6957,12 @@ public class NotificationStackScrollLayout 


    /** Use {@link ScrollViewFields#intrinsicStackHeight}, when SceneContainerFlag is enabled. */

    private int getContentHeight() {

        SceneContainerFlag.assertInLegacyMode();

        return mContentHeight;

    }



    private void setContentHeight(int contentHeight) {

        SceneContainerFlag.assertInLegacyMode();

        mContentHeight = contentHeight;

    }
@@ -6969,10 +6971,12 @@ public class NotificationStackScrollLayout 
     * @return the height of the content ignoring the footer.

     */

    public float getIntrinsicContentHeight() {

        SceneContainerFlag.assertInLegacyMode();

        return mIntrinsicContentHeight;

    }



    private void setIntrinsicContentHeight(float intrinsicContentHeight) {

        SceneContainerFlag.assertInLegacyMode();

        mIntrinsicContentHeight = intrinsicContentHeight;

    }

}