commit 61435b3d8232010babc2b3e13a0fc7923d425d9d
author Riddle Hsu <riddlehsu@google.com> Fri Apr 29 08:27:35 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 29 08:27:35 2022 +0000
tree 42fe69a6cfd5fda97fbf6907fc94b2b3a2203857
parent b8d50a3fc7372742fdaacc517f513458b6c120d3
parent b2866784140b4fcfba4f6b9bb8ef155d75c43562

Merge "Execute transition by starting window only if visible requested" into tm-qpr-dev

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

diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index cc209b5..df2be8c 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -6348,7 +6348,7 @@
         // starting window is drawn, the transition can start earlier. Exclude finishing and bubble
         // because it may be a trampoline.
         if (!wasTaskVisible && mStartingData != null && !finishing && !mLaunchedFromBubble
-                && !mDisplayContent.mAppTransition.isReady()
+                && mVisibleRequested && !mDisplayContent.mAppTransition.isReady()
                 && !mDisplayContent.mAppTransition.isRunning()
                 && mDisplayContent.isNextTransitionForward()) {
             // The pending transition state will be cleared after the transition is started, so