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

Merge "Avoid recursive destruction from exit animation done" into tm-dev am: 73dfe3e741

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

Change-Id: Ia1ab5e49a5d6824075dec89a0868f8ec9f9bbbeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riddle Hsu
2022-06-08 01:47:59 +00:00
committed by Automerger Merge Worker
parent 5036d1ea1d 73dfe3e741
commit a150b230ce
2 changed files with 49 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2433,14 +2433,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
@Override
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();
if (mRemoved) {
// Nothing to do.
ProtoLog.v(WM_DEBUG_ADD_REMOVE,
@@ -2449,6 +2441,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
}
mRemoved = true;
// 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();
mWillReplaceWindow = false;
if (mReplacementWindow != null) {
@@ -5090,7 +5087,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
// Otherwise we add the service to mDestroySurface and allow it to be processed in our next
// transaction.
if (mActivityRecord != null) {
mActivityRecord.destroySurfaces();
if (mAttrs.type == TYPE_BASE_APPLICATION) {
mActivityRecord.destroySurfaces();
} else {
destroySurface(false /* cleanupOnResume */, mActivityRecord.mAppStopped);
}
} else {
if (hasSurface) {
mWmService.mDestroySurface.add(this);

39
services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
View File

@@ -74,6 +74,7 @@ import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.atMost;
import static org.mockito.Mockito.clearInvocations;
import static org.mockito.Mockito.when;
@@ -471,6 +472,44 @@ public class WindowStateTests extends WindowTestsBase {
assertTrue(appWindow.mRemoved);
}
@Test
public void testOnExitAnimationDone() {
final WindowState parent = createWindow(null, TYPE_APPLICATION, "parent");
final WindowState child = createWindow(parent, TYPE_APPLICATION_PANEL, "child");
final SurfaceControl.Transaction t = parent.getPendingTransaction();
child.startAnimation(t, mock(AnimationAdapter.class), false /* hidden */,
SurfaceAnimator.ANIMATION_TYPE_WINDOW_ANIMATION);
parent.mAnimatingExit = parent.mRemoveOnExit = parent.mWindowRemovalAllowed = true;
child.mAnimatingExit = child.mRemoveOnExit = child.mWindowRemovalAllowed = true;
final int[] numRemovals = new int[2];
parent.registerWindowContainerListener(new WindowContainerListener() {
@Override
public void onRemoved() {
numRemovals[0]++;
}
});
child.registerWindowContainerListener(new WindowContainerListener() {
@Override
public void onRemoved() {
numRemovals[1]++;
}
});
spyOn(parent);
// parent onExitAnimationDone
// -> child onExitAnimationDone() -> no-op because isAnimating()
// -> parent destroySurface()
// -> parent removeImmediately() because mDestroying+mRemoveOnExit
// -> child removeImmediately() -> cancelAnimation()
// -> child onExitAnimationDone()
// -> child destroySurface() because animation is canceled
// -> child removeImmediately() -> no-op because mRemoved
parent.onExitAnimationDone();
// There must be no additional destroySurface() of parent from its child.
verify(parent, atMost(1)).destroySurface(anyBoolean(), anyBoolean());
assertEquals(1, numRemovals[0]);
assertEquals(1, numRemovals[1]);
}
@Test
public void testLayoutSeqResetOnReparent() {
final WindowState app = createWindow(null, TYPE_APPLICATION, "app");