commit 4ee29221dfb379e4fb736649570a614c6d5d8147
author Tony Wickham <twickham@google.com> Wed Jun 15 02:23:13 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 15 02:23:13 2022 +0000
tree 469ec5bbebc72f299413924e1b6064cbc8365627
parent baf27c1b5b29225df617fa88510a2b8395358ce7
parent 3945f028de26c07a8a1dd36ad4438280d59b7359

Merge "Revert line that could wrongly initialize RecentsView scroll" into tm-dev

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 73be5be..cba0b7d 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1187,7 +1187,9 @@
     }
 
     public int getScrollForPage(int index) {
-        if (!pageScrollsInitialized() || index >= mPageScrolls.length || index < 0) {
+        // TODO(b/233112195): Use !pageScrollsInitialized() instead of mPageScrolls == null, once we
+        // root cause where we should be using runOnPageScrollsInitialized().
+        if (mPageScrolls == null || index >= mPageScrolls.length || index < 0) {
             return 0;
         } else {
             return mPageScrolls[index];