commit ebea5dd5fc4ceb9f8eb5cfe3528adc4a1a2891ee
author Alex Chau <alexchau@google.com> Tue Jul 20 20:26:15 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 20 20:26:15 2021 +0000
tree f27ad3c07f6f12699ded11ce87670c0d2e2460c2
parent 3168d5b9f480d02f57205bdaf99487d4cbe0451d
parent 138724837887a6378a7b3f18012dda6cd0250ea5

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

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

Change-Id: I17d222e8b82ac3d349e72f51e5841f0c68ac2757

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(),