commit 3be86e59202c8c9f8f86ea0414e4a9d963e4ee27
author Hyunyoung Song <hyunyoungs@google.com> Tue Jun 15 01:18:37 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 15 01:18:37 2021 +0000
tree 4789930ed0f12d2fce834079d33c1d341fbc3540
parent 9f02e74e2324be2bff709ec405531c38dda64694
parent d4f7c9a666644b0ac0ebc40dfd8580ceddef30b0

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

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

Change-Id: I10f9305958fe5ecb9d95b2647d1a86547167f891

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;
             }