commit 138724837887a6378a7b3f18012dda6cd0250ea5
author Alex Chau <alexchau@google.com> Tue Jul 20 20:09:28 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 20 20:09:28 2021 +0000
tree adf1a38da129c99a65e1cdf97866127f1c731e56
parent 9d7cc7d59fe13e63b24b032061a077bb58de6d69
parent de6819a453180bd7fd4ec63d21d09b36b9b7acc9

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

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