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

This commit is contained in:
Rob Carr
2021-03-16 20:46:32 +00:00
committed by Android (Google) Code Review

View File

@@ -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) {