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

Merge "[Shell Transition] Defer remove splash screen window when it is inTransition."

Browse Source
This commit is contained in:
Wei Sheng Shih
2022-09-20 07:46:37 +00:00
committed by Android (Google) Code Review
parent 39e011d00a aa82677f8c
commit 3244bf364d
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2755,6 +2755,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
}
final StartingSurfaceController.StartingSurface surface;
final WindowState startingWindow = mStartingWindow;
final boolean animate;
if (mStartingData != null) {
animate = prepareAnimation && mStartingData.needRevealAnimation()
@@ -2779,7 +2780,19 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
return;
}
surface.remove(animate);
if (animate && mTransitionController.inCollectingTransition(startingWindow)
&& startingWindow.cancelAndRedraw()) {
// Defer remove starting window after transition start.
// If splash screen window was in collecting, the client side is unable to draw because
// of Session#cancelDraw, which will blocking the remove animation.
startingWindow.mSyncTransaction.addTransactionCommittedListener(Runnable::run, () -> {
synchronized (mAtmService.mGlobalLock) {
surface.remove(true);
}
});
} else {
surface.remove(animate);
}
}
/**