From b85215ff62262b29c8686adc7924765676283ca1 Mon Sep 17 00:00:00 2001
From: arangelov <arangelov@google.com>
Date: Tue, 30 Jun 2020 18:52:34 +0100
Subject: [PATCH] Don't update height if recycler view was scrolled

Fixes: 159999176
Fixes: 159997845
Test: manual
Test: atest ChooserActivityTest
Change-Id: Ie867ee419b3595023195022b0f9f12e5da214938
---
 core/java/com/android/internal/app/ChooserActivity.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index 14cf258f18ab2..50579cce23eb8 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -2640,7 +2640,10 @@ public class ChooserActivity extends ResolverActivity implements
         }
         RecyclerView recyclerView = mChooserMultiProfilePagerAdapter.getActiveAdapterView();
         ChooserGridAdapter gridAdapter = mChooserMultiProfilePagerAdapter.getCurrentRootAdapter();
-        if (gridAdapter == null || recyclerView == null) {
+        // Skip height calculation if recycler view was scrolled to prevent it inaccurately
+        // calculating the height, as the logic below does not account for the scrolled offset.
+        if (gridAdapter == null || recyclerView == null
+                || recyclerView.computeVerticalScrollOffset() != 0) {
             return;
         }