commit 36d818fbf268a2c798d89ccd63f1e66bdcde1e6a
author Wei Sheng Shih <wilsonshih@google.com> Tue Oct 17 11:03:10 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 17 11:03:10 2023 +0000
tree 4d24038d24b8e20336c87f3c95e5a88ee74548cb
parent f170fb6123ceeb0107d4ad658c60fd0a54a11dd3
parent e2c91481ed91e58d74380f4f0ffcd6ac94736260

Merge "Respect no animation request when calling moveTaskToFront." into main

services/core/java/com/android/server/wm/Task.java

diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index 1d5d279..4922e90 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -5635,6 +5635,8 @@
             if (noAnimation) {
                 mDisplayContent.prepareAppTransition(TRANSIT_NONE);
                 mTaskSupervisor.mNoAnimActivities.add(top);
+                mTransitionController.collect(top);
+                mTransitionController.setNoAnimation(top);
                 ActivityOptions.abort(options);
             } else {
                 updateTransitLocked(TRANSIT_TO_FRONT, options);