commit 8c0f8fba9ce5dc5b9fab14e5fb6d015c32e4637b
author Hyunyoung Song <hyunyoungs@google.com> Mon Jun 14 23:18:22 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 14 23:18:22 2021 +0000
tree b2a707592b6df4a5335d5a11b34d88c187dba318
parent b8cec440cc0840c18c67856714b22ab9a365738c
parent a9aeebc5bb3e592047a186a4f90435c5feb71328

Merge "Fix NPE inside REcyclerViewFastScroller" into sc-dev

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