From 90097d873d2cdbe083ae2647af070346c9c0a8c0 Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Tue, 4 May 2021 22:02:16 -0700
Subject: [PATCH] Fixes NPE in AbsSwipeUpHandler.

Fixes: 187243410
Test: Manual (not sure of exact repro steps, but I was hitting it
before installing - though reinstall itself may have fixed it).

Change-Id: I7510a675da9d2c1a484da8e00ca856f19445025c
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 61803aa13b..70557ded31 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1705,7 +1705,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
         // No need to apply any transform if there is ongoing swipe-pip-to-home animator since
         // that animator handles the leash solely.
         if (mRecentsAnimationTargets != null && !mIsSwipingPipToHome) {
-            if (mRecentsViewScrollLinked) {
+            if (mRecentsViewScrollLinked && mRecentsView != null) {
                 mTaskViewSimulator.setScroll(mRecentsView.getScrollOffset());
             }
             mTaskViewSimulator.apply(mTransformParams);