Merge "SurfaceView: Remove deferred transaction" into sc-dev (e410f1ff) · Commits · e / os / android_frameworks_base

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