commit 6eac57224619ae751e7920feeb79ed11d46e24bc
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 02 21:33:41 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 02 21:33:41 2020 +0000
tree a770c666989d1685f8c482c15b5b4bdf4d5f7451
parent cc74b3a79c5c72204c2f38f57463ee980e75b79a
parent 71bb2d9ab595298cf705ee85519aeaa98828b61b

Merge "Fixing nullpointerexception when applying transformParams" into ub-launcher3-rvc-dev

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