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

Merge "Fix rotation shell transition" into sc-v2-dev

Browse Source
This commit is contained in:
Evan Rosky
2021-07-13 21:21:02 +00:00
committed by Android (Google) Code Review
parent 1cf060f139 20a817a198
commit 438d1c5327
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8183,7 +8183,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
if (shouldRelaunchLocked(changes, mTmpConfig) || forceNewConfig) { if (shouldRelaunchLocked(changes, mTmpConfig) || forceNewConfig) {
// Aha, the activity isn't handling the change, so DIE DIE DIE. // Aha, the activity isn't handling the change, so DIE DIE DIE.
configChangeFlags |= changes; configChangeFlags |= changes;
startFreezingScreenLocked(globalChanges); if (!mAtmService.getTransitionController().isShellTransitionsEnabled()) {
startFreezingScreenLocked(globalChanges);
}
forceNewConfig = false; forceNewConfig = false;
preserveWindow &= isResizeOnlyChange(changes); preserveWindow &= isResizeOnlyChange(changes);
final boolean hasResizeChange = hasResizeChange(changes & ~info.getRealConfigChanged()); final boolean hasResizeChange = hasResizeChange(changes & ~info.getRealConfigChanged());

8
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -2403,6 +2403,12 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
@Override @Override
void removeImmediately() { void removeImmediately() {
if (!mRemoved) {
// Destroy surface before super call. The general pattern is that the children need
// to be removed before the parent (so that the sync-engine tracking works). Since
// WindowStateAnimator is a "virtual" child, we have to do it manually here.
mWinAnimator.destroySurfaceLocked(getSyncTransaction());
}
super.removeImmediately(); super.removeImmediately();
if (mRemoved) { if (mRemoved) {
@@ -2444,8 +2450,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
disposeInputChannel(); disposeInputChannel();
mWinAnimator.destroySurfaceLocked(mTmpTransaction);
mTmpTransaction.apply();
mSession.windowRemovedLocked(); mSession.windowRemovedLocked();
try { try {
mClient.asBinder().unlinkToDeath(mDeathRecipient, 0); mClient.asBinder().unlinkToDeath(mDeathRecipient, 0);