commit d4f7c9a666644b0ac0ebc40dfd8580ceddef30b0
author Hyunyoung Song <hyunyoungs@google.com> Tue Jun 15 01:03:46 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 15 01:03:46 2021 +0000
tree 021cbdfed7cc5b78373ab12f94b74f98df0a75cd
parent 22617e92ca5e0179366dc4c32e6e542e9e71b422
parent 8c0f8fba9ce5dc5b9fab14e5fb6d015c32e4637b

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

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

Change-Id: I6bab2c6eb3c2e2ba1a6566d296752717b121cb33

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