summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lyn Han <lynhan@google.com> 2021-05-04 15:02:11 -0500
committer Lyn Han <lynhan@google.com> 2021-05-04 15:02:11 -0500
commit03e6e450851863fffd35a52f68fc6a42936a81d8 (patch)
tree8020dd5c7bec3b6344dfb62fb466d32b78eea991
parent8315904e81442e659ad8535e2fffdca39744d194 (diff)
Fix stack overflow from setOwnScrollY
Fixes: 186961122 Test: manual Change-Id: I12eebfdfe5d6ed93be349957baf84fad4f725648
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
index b81619317b95..bae44fcaff34 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
@@ -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();
@@ -4542,7 +4541,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();
}