commit cf6900d9eea0e4df78c980d0fd07638936b5d2fa
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 05 17:41:48 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 05 17:41:48 2021 +0000
tree 4ade850fec6dd02a288a1ac5e94a43fba8f4abb9
parent cc03a9afa969a081f7b60e14cf5e1a5a97012644
parent 90097d873d2cdbe083ae2647af070346c9c0a8c0

Merge "Fixes NPE in AbsSwipeUpHandler." into sc-dev

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 54adde2..10384a8 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1701,7 +1701,7 @@
         // 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);