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

Commit 31068add authored by Marzia Favaro's avatar Marzia Favaro
Browse files

Fix finish callback transaction 

An old transaction was being used. Get the current sync transaction
instead.

Bug: 327332488
Fix: 334577675
Test: DimmerTests
Flag: EXEMPT minor change
Change-Id: Ic46eaa4c720a08f8ad523d1fa3031a8c6eac71b5
parent 64feeb26

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

+4 −2
Original line number Diff line number Diff line
@@ -184,9 +184,11 @@ public class DimmerAnimationHelper { 
        mLocalAnimationAdapter.startAnimation(dim.mDimSurface, t,

                ANIMATION_TYPE_DIMMER, /* finishCallback */ (type, animator) -> {

                    synchronized (dim.mHostContainer.mWmService.mGlobalLock) {

                        setCurrentAlphaBlur(dim.mDimSurface, t);

                        SurfaceControl.Transaction finishTransaction =

                                dim.mHostContainer.getSyncTransaction();

                        setCurrentAlphaBlur(dim.mDimSurface, finishTransaction);

                        if (targetAlpha == 0f && !dim.isDimming()) {

                            dim.remove(t);

                            dim.remove(finishTransaction);

                        }

                        mLocalAnimationAdapter = null;

                        mAlphaAnimationSpec = null;

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

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ public class DimmerTests extends WindowTestsBase { 
    @Before

    public void setUp() throws Exception {

        MockSurfaceBuildingContainer host = new MockSurfaceBuildingContainer(mWm);

        mTransaction = spy(StubTransaction.class);

        mTransaction = host.getSyncTransaction();



        final SurfaceControl mControl1 = mock(SurfaceControl.class);

        final SurfaceControl mControl2 = mock(SurfaceControl.class);