commit a5653a268f5896c453198389a69a3bca03edd5d1
author Alex Chau <alexchau@google.com> Tue Jul 20 20:37:44 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 20 20:37:44 2021 +0000
tree ff3eae5790ea03bd446e4d0abf6bc19cd1423c26
parent e20812ffa2017167f795ce6174835e3ffc06e010
parent ebea5dd5fc4ceb9f8eb5cfe3528adc4a1a2891ee

Merge "Check if running task is null in onPrepareGestureEndAnimation" into sc-v2-dev am: 1387248378 am: ebea5dd5fc

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

Change-Id: Ia54d78d7bebbd8b52e36970973a64172463c3ee0

quickstep/src/com/android/quickstep/views/RecentsView.java

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index b8a38ad..e128942 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1792,7 +1792,7 @@
                 .displayOverviewTasksAsGrid(mActivity.getDeviceProfile())) {
             TaskView runningTaskView = getRunningTaskView();
             float runningTaskPrimaryGridTranslation = 0;
-            if (indexOfChild(runningTaskView) != getNextPage()) {
+            if (runningTaskView != null && indexOfChild(runningTaskView) != getNextPage()) {
                 // Apply the gird translation to running task unless it's being snapped to.
                 runningTaskPrimaryGridTranslation = mOrientationHandler.getPrimaryValue(
                         runningTaskView.getGridTranslationX(),