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

Commit 6e25452a authored by burakov's avatar burakov Committed by Danny Burakov
Browse files

Revert "[flexiglass] Verify that NSSL#mContentHeight is not accessed" 

Partially revert submission 30042981 (remove calls to
SceneContainerFlag.assertInLegacyMode).

Reason for revert: Crashes Flexiglass

Reverted changes: /q/submissionid:30042981
Flag: EXEMPT removing assertions
Bug: 376018224
Test: Unit tests pass.
Test: Manually verified by opening the shade on lockscreen.

Change-Id: I9f12c27d3dfd5e461f90b23fc4fa307f8cbccee5
parent 4ad088b6

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

+0 −4
Original line number Diff line number Diff line
@@ -6953,12 +6953,10 @@ 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;

    }
@@ -6967,12 +6965,10 @@ 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;

    }

}