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

Commit 4d1f5830 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Destroy dim layer in transaction."

parents 79e4b948 78a3d469

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

+3 −2
Original line number Diff line number Diff line
@@ -126,9 +126,10 @@ class Dimmer { 
        DimState(SurfaceControl dimLayer) {

            mDimLayer = dimLayer;

            mDimming = true;

            mSurfaceAnimator = new SurfaceAnimator(new DimAnimatable(dimLayer), () -> {

            final DimAnimatable dimAnimatable = new DimAnimatable(dimLayer);

            mSurfaceAnimator = new SurfaceAnimator(dimAnimatable, () -> {

                if (!mDimming) {

                    mDimLayer.destroy();

                    dimAnimatable.getPendingTransaction().destroy(mDimLayer);

                }

            }, mHost.mService);

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import org.junit.Test; 


/**

 * Build/Install/Run:

 *  atest FrameworksServicesTests:DimmerTests;

 *  atest FrameworksServicesTests:DimmerTests

 */

@Presubmit

public class DimmerTests extends WindowTestsBase {
@@ -211,7 +211,7 @@ public class DimmerTests extends WindowTestsBase { 
        mDimmer.updateDims(mTransaction, new Rect());

        verify(mSurfaceAnimatorStarter).startAnimation(any(SurfaceAnimator.class), any(

                SurfaceControl.Transaction.class), any(AnimationAdapter.class), anyBoolean());

        verify(dimLayer).destroy();

        verify(mHost.getPendingTransaction()).destroy(dimLayer);

    }



    @Test