commit 6eb4af3f45c58955789594d8c2f36311def12c4d
author Winson Chung <winsonc@google.com> Fri Jul 21 16:11:54 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 21 16:11:54 2023 +0000
tree 7ac42b79b8d08ff56567c8d6d8880a6d8b3c801b
parent 5cc62b13ee465f4411bde37bf4c2834e4171fa15
parent 5ad13e3412a120b3c35a0b0d32bd163f4a7d04b3

Merge "Add null check for invalid previously appeared target" into udc-qpr-dev

quickstep/src/com/android/quickstep/TaskAnimationManager.java

diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
index 739f10e..c0684d7 100644
--- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java
+++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
@@ -206,7 +206,8 @@
                     if (mLastAppearedTaskTargets != null) {
                         for (RemoteAnimationTarget lastTarget : mLastAppearedTaskTargets) {
                             for (RemoteAnimationTarget appearedTarget : appearedTaskTargets) {
-                                if (appearedTarget.taskId != lastTarget.taskId) {
+                                if (lastTarget != null &&
+                                        appearedTarget.taskId != lastTarget.taskId) {
                                     mController.removeTaskTarget(lastTarget.taskId);
                                 }
                             }