Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "presubmit-am-e79376c595e84012896e46b94a9fa3c3" into tm-mainline-prod

Browse Source 
* changes:
  [automerge] Execute transition by starting window only if visible requested 2p: 37d61f3b05
  Execute transition by starting window only if visible requested
This commit is contained in:
TreeHugger Robot
2022-04-12 16:27:09 +00:00
committed by Android (Google) Code Review
parent ffb6105617 e0f1e0b85c
commit dfab9a7b4c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -6300,7 +6300,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
// starting window is drawn, the transition can start earlier. Exclude finishing and bubble // starting window is drawn, the transition can start earlier. Exclude finishing and bubble
// because it may be a trampoline. // because it may be a trampoline.
if (!wasTaskVisible && mStartingData != null && !finishing && !mLaunchedFromBubble if (!wasTaskVisible && mStartingData != null && !finishing && !mLaunchedFromBubble
&& !mDisplayContent.mAppTransition.isReady() && mVisibleRequested && !mDisplayContent.mAppTransition.isReady()
&& !mDisplayContent.mAppTransition.isRunning() && !mDisplayContent.mAppTransition.isRunning()
&& mDisplayContent.isNextTransitionForward()) { && mDisplayContent.isNextTransitionForward()) {
// The pending transition state will be cleared after the transition is started, so // The pending transition state will be cleared after the transition is started, so