From a9aeebc5bb3e592047a186a4f90435c5feb71328 Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Mon, 14 Jun 2021 09:12:30 -0700 Subject: [PATCH] Fix NPE inside REcyclerViewFastScroller Bug: 190939643 Test: manual Change-Id: Ic01111bb1389b2fa84d86c0ecc20f1eec0940e51 --- src/com/android/launcher3/views/RecyclerViewFastScroller.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/launcher3/views/RecyclerViewFastScroller.java b/src/com/android/launcher3/views/RecyclerViewFastScroller.java index f49d1b5d2a..78916acd16 100644 --- a/src/com/android/launcher3/views/RecyclerViewFastScroller.java +++ b/src/com/android/launcher3/views/RecyclerViewFastScroller.java @@ -344,7 +344,7 @@ public class RecyclerViewFastScroller extends View { // 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; }