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

Merge "Clear ZBoost when removing animation leash" into tm-dev

Browse Source
This commit is contained in:
Riddle Hsu
2022-04-11 08:43:44 +00:00
committed by Android (Google) Code Review
parent 0bc526772e ce30ad8749
commit 2e495889be
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/wm/WindowContainer.java
View File

@@ -3181,6 +3181,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
mLastLayer = -1; mLastLayer = -1;
mWmService.mSurfaceAnimationRunner.onAnimationLeashLost(mAnimationLeash, t); mWmService.mSurfaceAnimationRunner.onAnimationLeashLost(mAnimationLeash, t);
mAnimationLeash = null; mAnimationLeash = null;
mNeedsZBoost = false;
reassignLayer(t); reassignLayer(t);
updateSurfacePosition(t); updateSurfacePosition(t);
} }

5
services/tests/wmtests/src/com/android/server/wm/AppWindowTokenAnimationTests.java
View File

@@ -88,6 +88,11 @@ public class AppWindowTokenAnimationTests extends WindowTestsBase {
verify(mTransaction).setLayer(eq(mActivity.mAnimationBoundsLayer), verify(mTransaction).setLayer(eq(mActivity.mAnimationBoundsLayer),
intThat(layer -> layer > topActivity.getLastLayer())); intThat(layer -> layer > topActivity.getLastLayer()));
// The layer should be restored after the animation leash is removed.
mActivity.onAnimationLeashLost(mTransaction);
assertThat(mActivity.mNeedsZBoost).isFalse();
assertThat(topActivity.getLastLayer()).isGreaterThan(mActivity.getLastLayer());
} }
@Test @Test