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

Merge "Execute transition by starting window only if it is forward type"

Browse Source
This commit is contained in:
Riddle Hsu
2021-11-18 02:15:04 +00:00
committed by Android (Google) Code Review
parent 69d67f589b 3b61847cf2
commit 5020adddf7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5971,10 +5971,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
// because it may be a trampoline.
if (!wasTaskVisible && mStartingData != null && !finishing && !mLaunchedFromBubble
&& !mDisplayContent.mAppTransition.isReady()
&& !mDisplayContent.mAppTransition.isRunning()) {
&& !mDisplayContent.mAppTransition.isRunning()
&& mDisplayContent.isNextTransitionForward()) {
// The pending transition state will be cleared after the transition is started, so
// save the state for launching the client later (used by LaunchActivityItem).
mStartingData.mIsTransitionForward = mDisplayContent.isNextTransitionForward();
mStartingData.mIsTransitionForward = true;
mDisplayContent.executeAppTransition();
}
}