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." into tm-qpr-dev am: 9394254fe5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19953044

Change-Id: I2f83699e9b3768f0e9be42f3d0776527b328f34b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wei Sheng Shih
2022-09-23 12:42:46 +00:00
committed by Automerger Merge Worker
parent d0d6108d10 9394254fe5
commit 32b7c278ba
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2764,6 +2764,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
final StartingSurfaceController.StartingSurface surface;
final StartingData startingData = mStartingData;
final WindowState startingWindow = mStartingWindow;
if (mStartingData != null) {
surface = mStartingSurface;
mStartingData = null;
@@ -2782,21 +2783,31 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
return;
}
ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Schedule remove starting %s startingWindow=%s"
+ " startingView=%s Callers=%s", this, mStartingWindow, mStartingSurface,
Debug.getCallers(5));
final boolean removeWithAnimate = prepareAnimation && startingData.needRevealAnimation();
final Runnable removeSurface = () -> {
ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Removing startingView=%s", surface);
try {
surface.remove(prepareAnimation && startingData.needRevealAnimation());
surface.remove(removeWithAnimate);
} catch (Exception e) {
Slog.w(TAG_WM, "Exception when removing starting window", e);
}
};
removeSurface.run();
if (removeWithAnimate && 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) {
removeSurface.run();
}
});
} else {
removeSurface.run();
}
}
/**