Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e495889 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

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

parents 0bc52677 ce30ad87

services/core/java/com/android/server/wm/WindowContainer.java

+1 −0
Original line number Diff line number Diff line
@@ -3181,6 +3181,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
        mLastLayer = -1;

        mWmService.mSurfaceAnimationRunner.onAnimationLeashLost(mAnimationLeash, t);

        mAnimationLeash = null;

        mNeedsZBoost = false;

        reassignLayer(t);

        updateSurfacePosition(t);

    }

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

+5 −0
Original line number Diff line number Diff line
@@ -88,6 +88,11 @@ public class AppWindowTokenAnimationTests extends WindowTestsBase { 


        verify(mTransaction).setLayer(eq(mActivity.mAnimationBoundsLayer),

                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