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

Commit 4f0948ce authored by Justin Weir's avatar Justin Weir
Browse files

Assert legacy mode in 3 NSSL methods that register callbacks 

None of setOnScrollListener, setOnStackYChanged, or
setOverscrollTopChangedListener should be called when scenes are
enabled.

Fixes: 348015461
Test: manually verified non-crash with scenes enabled
Flag: com.android.systemui.scene_container
Change-Id: Iae958070a7d2d11ae2a3ee9eb6c60587951ff7a4
parent 9d538728

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

+3 −0
Original line number Diff line number Diff line
@@ -1491,6 +1491,7 @@ public class NotificationStackScrollLayout 
     * needed.

     */

    void setOnStackYChanged(Consumer<Boolean> onStackYChanged) {

        SceneContainerFlag.assertInLegacyMode();

        mOnStackYChanged = onStackYChanged;

    }
@@ -2271,6 +2272,7 @@ public class NotificationStackScrollLayout 


    public void setOverscrollTopChangedListener(

            OnOverscrollTopChangedListener overscrollTopChangedListener) {

        SceneContainerFlag.assertInLegacyMode();

        mOverscrollTopChangedListener = overscrollTopChangedListener;

    }
@@ -5716,6 +5718,7 @@ public class NotificationStackScrollLayout 
     * Set a listener to when scrolling changes.

     */

    public void setOnScrollListener(Consumer<Integer> listener) {

        SceneContainerFlag.assertInLegacyMode();

        mScrollListener = listener;

    }

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

+3 −0
Original line number Diff line number Diff line
@@ -1052,6 +1052,7 @@ public class NotificationStackScrollLayoutController implements Dumpable { 


    public void setOverscrollTopChangedListener(

            OnOverscrollTopChangedListener listener) {

        SceneContainerFlag.assertInLegacyMode();

        mView.setOverscrollTopChangedListener(listener);

    }
@@ -1248,6 +1249,7 @@ public class NotificationStackScrollLayoutController implements Dumpable { 
    }



    public void setOnStackYChanged(Consumer<Boolean> onStackYChanged) {

        SceneContainerFlag.assertInLegacyMode();

        mView.setOnStackYChanged(onStackYChanged);

    }
@@ -1750,6 +1752,7 @@ public class NotificationStackScrollLayoutController implements Dumpable { 
     * Set a listener to when scrolling changes.

     */

    public void setOnScrollListener(Consumer<Integer> listener) {

        SceneContainerFlag.assertInLegacyMode();

        mView.setOnScrollListener(listener);

    }