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

Commit 8100af01 authored by Rob Carr's avatar Rob Carr Committed by Automerger Merge Worker
Browse files

Merge "SurfaceView: Remove deferred transaction" into sc-dev am: e410f1ff 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13855847

Change-Id: Ia6670547fdc2fc081c290e677bc7ac2ee696ff3a
parents 3a68a55e e410f1ff

core/java/android/view/SurfaceView.java

+0 −14
Original line number Diff line number Diff line
@@ -1390,14 +1390,6 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 
            viewRoot.mergeWithNextTransaction(mRtTransaction, frameNumber);

            return;

        }



        // Otherwise if the if the ViewRoot is not null, use deferred transaction instead.

        if (frameNumber > 0 && viewRoot != null && viewRoot.mSurface.isValid()

                && mSurfaceControl != null) {

            mRtTransaction.deferTransactionUntil(mSurfaceControl,

                    viewRoot.getSurfaceControl(), frameNumber);

        }

        mRtTransaction.apply();

    }



    private Rect mRTLastReportedPosition = new Rect();
@@ -1470,12 +1462,6 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 
             */

            synchronized (mSurfaceControlLock) {

                final ViewRootImpl viewRoot = getViewRootImpl();

                boolean deferTransaction = frameNumber > 0 && viewRoot != null

                        && viewRoot.mSurface.isValid() && !useBLASTSync(viewRoot);

                if (deferTransaction) {

                    mRtTransaction.deferTransactionUntil(mSurfaceControl,

                            viewRoot.getSurfaceControl(), frameNumber);

                }



                mRtTransaction.hide(mSurfaceControl);

                if (mRtReleaseSurfaces) {