commit 161066c47b4acc46663ec042dfd79655ea4b31c3
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 02 21:37:39 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 02 21:37:39 2020 +0000
tree e469a5e6c110d56d0c46b8842b64afa3083489bf
parent dd7ce9df60059df81cbc0e77b2f6e043f5f53ed5
parent 6eac57224619ae751e7920feeb79ed11d46e24bc

Merge "Fixing nullpointerexception when applying transformParams" into ub-launcher3-rvc-dev am: 6eac572246

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

Change-Id: I5a41c6da9e24e6077b5da40fcb3137c0043fe602

quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java
index 737d837..045f459 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java
@@ -356,7 +356,8 @@
         if (mWindowTransitionController != null) {
             float progress = mCurrentShift.value / mDragLengthFactor;
             mWindowTransitionController.setPlayFraction(progress);
-
+        }
+        if (mRecentsAnimationTargets != null) {
             if (mRecentsViewScrollLinked) {
                 mTaskViewSimulator.setScroll(mRecentsView.getScrollOffset());
             }