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

Commit 4f14be3d authored by Matthew Bouyack's avatar Matthew Bouyack Committed by Android (Google) Code Review
Browse files

Merge "Avoid redundant setMatrix calls from setMatrixInTransaction This... 

Merge "Avoid redundant setMatrix calls from setMatrixInTransaction This matches the behavior of setPositionInTransaction and setSizeInTransaction." into cw-f-dev
parents 90d300a0 8dd88f64

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

+21 −1
Original line number Diff line number Diff line
@@ -57,6 +57,12 @@ class WindowSurfaceController { 
    private float mSurfaceW = 0;

    private float mSurfaceH = 0;



    // Initialize to the identity matrix.

    private float mLastDsdx = 1;

    private float mLastDtdx = 0;

    private float mLastDsdy = 0;

    private float mLastDtdy = 1;



    private float mSurfaceAlpha = 0;



    private int mSurfaceLayer = 0;
@@ -266,6 +272,17 @@ class WindowSurfaceController { 


    void setMatrixInTransaction(float dsdx, float dtdx, float dsdy, float dtdy,

            boolean recoveringMemory) {

        final boolean matrixChanged = mLastDsdx != dsdx || mLastDtdx != dtdx ||

                                      mLastDsdy != dsdy || mLastDtdy != dtdy;

        if (!matrixChanged) {

            return;

        }



        mLastDsdx = dsdx;

        mLastDtdx = dtdx;

        mLastDsdy = dsdy;

        mLastDtdy = dtdy;



        try {

            if (SHOW_TRANSACTIONS) logSurface(

                    "MATRIX [" + dsdx + "," + dtdx + "," + dsdy + "," + dtdy + "]", null);
@@ -281,7 +298,6 @@ class WindowSurfaceController { 
                mAnimator.reclaimSomeSurfaceMemory("matrix", true);

            }

        }

        return;

    }



    boolean setSizeInTransaction(int width, int height, boolean recoveringMemory) {
@@ -318,6 +334,10 @@ class WindowSurfaceController { 
                mSurfaceControl.setAlpha(alpha);

                mSurfaceLayer = layer;

                mSurfaceControl.setLayer(layer);

                mLastDsdx = dsdx;

                mLastDtdx = dtdx;

                mLastDsdy = dsdy;

                mLastDtdy = dtdy;

                mSurfaceControl.setMatrix(

                        dsdx, dtdx, dsdy, dtdy);