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

Commit f0f55ff4 authored by Lyn Han's avatar Lyn Han Committed by Automerger Merge Worker
Browse files

Merge "Fix stack overflow from setOwnScrollY" into sc-dev am: 52e5dd7f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14429645

Change-Id: I947af8bf69c53bdd4360caf6aece4b4092ebe0a7
parents e831feb3 52e5dd7f

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

+1 −2
Original line number Diff line number Diff line
@@ -1000,7 +1000,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        mAmbientState.setCurrentScrollVelocity(mScroller.isFinished()

                ? 0

                : mScroller.getCurrVelocity());

        mAmbientState.setScrollY(mOwnScrollY);

        mStackScrollAlgorithm.resetViewStates(mAmbientState, getSpeedBumpIndex());

        if (!isCurrentlyAnimating() && !mNeedsAnimation) {

            applyCurrentState();
@@ -4532,7 +4531,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
            // We still want to call the normal scrolled changed for accessibility reasons

            onScrollChanged(mScrollX, ownScrollY, mScrollX, mOwnScrollY);

            mOwnScrollY = ownScrollY;

            updateChildren();

            mAmbientState.setScrollY(mOwnScrollY);

            updateOnScrollChange();

            updateStackPosition();

        }