From 03e6e450851863fffd35a52f68fc6a42936a81d8 Mon Sep 17 00:00:00 2001
From: Lyn Han <lynhan@google.com>
Date: Tue, 4 May 2021 15:02:11 -0500
Subject: [PATCH] Fix stack overflow from setOwnScrollY

Fixes: 186961122
Test: manual
Change-Id: I12eebfdfe5d6ed93be349957baf84fad4f725648
---
 .../notification/stack/NotificationStackScrollLayout.java      | 3 +--
 1 file changed, 1 insertion(+), 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 b81619317b95c..bae44fcaff343 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();
         }