From ec24677cab8dc44fb7350f15c476982852b6a540 Mon Sep 17 00:00:00 2001 From: Robert Carr Date: Thu, 11 Mar 2021 19:33:30 -0800 Subject: [PATCH] SurfaceView: Remove deferred transaction Replaced with BLASTSync for a few months now. Bug: 168505645 Test: Existing tests pass, this was already non running code. Change-Id: Iee6423e923d8bdedc508c021e63b313787450896 --- core/java/android/view/SurfaceView.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index 9688c677b9001..3ffe0c660f9a8 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -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) {