commit 0ae7a20736e657566e6c4a6d68d157f39f7f111c
author Hyunyoung Song <hyunyoungs@google.com> Mon Jun 14 23:40:38 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 14 23:40:38 2021 +0000
tree 55ed0d5adcd7fc411ff88fa89ec0f4a9b1d8b335
parent 27ed8af0369308b830f50f92b90d98bc3f8c5022
parent 4b92c20bc69e104b34e7cc84b1bce423ffac872a

Merge "Fix NPE inside REcyclerViewFastScroller" into sc-dev am: 8c0f8fba9c am: 4b92c20bc6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14966513

Change-Id: I06218e1ad60890c4f3168805760395ee73e60b9b

src/com/android/launcher3/views/RecyclerViewFastScroller.java

diff --git a/src/com/android/launcher3/views/RecyclerViewFastScroller.java b/src/com/android/launcher3/views/RecyclerViewFastScroller.java
index f49d1b5..78916ac 100644
--- a/src/com/android/launcher3/views/RecyclerViewFastScroller.java
+++ b/src/com/android/launcher3/views/RecyclerViewFastScroller.java
@@ -344,7 +344,7 @@
             // swiping very close to the thumb area (not just within it's bound)
             // will also prevent back gesture
             SYSTEM_GESTURE_EXCLUSION_RECT.get(0).offset(mThumbDrawOffset.x, mThumbDrawOffset.y);
-            if (Utilities.ATLEAST_Q) {
+            if (Utilities.ATLEAST_Q && mSystemGestureInsets != null) {
                 SYSTEM_GESTURE_EXCLUSION_RECT.get(0).left =
                         SYSTEM_GESTURE_EXCLUSION_RECT.get(0).right - mSystemGestureInsets.right;
             }