Merge "[automerger skipped] Merge "Fix autogroupsummary bug" am: 15e5749d4b am: b5d8f6a658 am: 5378a82b02 -s ours am: bea3673553 -s ours am: 766f0616c8 -s ours" into tm-qpr-dev

This commit is contained in:
Automerger Merge Worker
2022-04-13 10:42:59 +00:00
committed by Android (Google) Code Review

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
// because it may be a trampoline.
if (!wasTaskVisible && mStartingData != null && !finishing && !mLaunchedFromBubble
&& mVisibleRequested && !mDisplayContent.mAppTransition.isReady()
&& !mDisplayContent.mAppTransition.isReady()
&& !mDisplayContent.mAppTransition.isRunning()
&& mDisplayContent.isNextTransitionForward()) {
// The pending transition state will be cleared after the transition is started, so