Merge "SurfaceView: Remove blast debug flag" (615186a1) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -11365,15 +11365,6 @@ public final class Settings {
		public static final String DEVELOPMENT_USE_BLAST_ADAPTER_VR =
		"use_blast_adapter_vr";

		/**
		* If true, submit buffers using blast in SurfaceView.
		* (0 = false, 1 = true)
		* @hide
		*/
		@Readable
		public static final String DEVELOPMENT_USE_BLAST_ADAPTER_SV =
		"use_blast_adapter_sv";

		/**
		* Path to the WindowManager display settings file. If unset, the default file path will
		* be used.

core/java/android/view/SurfaceView.java

+23 −91

Original line number	Diff line number	Diff line
		@@ -131,9 +131,6 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		private final SurfaceSession mSurfaceSession = new SurfaceSession();

		SurfaceControl mSurfaceControl;
		// In the case of format changes we switch out the surface in-place
		// we need to preserve the old one until the new one has drawn.
		SurfaceControl mDeferredDestroySurfaceControl;
		SurfaceControl mBackgroundControl;
		private boolean mDisableBackgroundLayer = false;

		@@ -243,18 +240,8 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		private final Matrix mTmpMatrix = new Matrix();

		SurfaceControlViewHost.SurfacePackage mSurfacePackage;
		private final boolean mUseBlastSync = true;

		/**
		* Returns {@code true} if buffers should be submitted via blast
		*/
		private static boolean useBlastAdapter(Context context) {
		ContentResolver contentResolver = context.getContentResolver();
		return Settings.Global.getInt(contentResolver,
		Settings.Global.DEVELOPMENT_USE_BLAST_ADAPTER_SV, 1 /* default */) == 1;
		}

		private final boolean mUseBlastAdapter;
		private SurfaceControl mBlastSurfaceControl;
		private BLASTBufferQueue mBlastBufferQueue;

		@@ -278,8 +265,6 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		public SurfaceView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr,
		int defStyleRes, boolean disableBackgroundLayer) {
		super(context, attrs, defStyleAttr, defStyleRes);
		mUseBlastAdapter = useBlastAdapter(context);

		setWillNotDraw(true);
		mDisableBackgroundLayer = disableBackgroundLayer;
		}
		@@ -492,12 +477,6 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall

		private void performDrawFinished(Transaction t) {
		mSyncTransaction.merge(t);
		if (mDeferredDestroySurfaceControl != null) {
		synchronized (mSurfaceControlLock) {
		mTmpTransaction.remove(mDeferredDestroySurfaceControl).apply();
		mDeferredDestroySurfaceControl = null;
		}
		}

		if (mPendingReportDraws > 0) {
		mDrawFinished = true;
		@@ -1140,11 +1119,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		if (creating) {
		updateOpaqueFlag();
		final String name = "SurfaceView[" + viewRoot.getTitle().toString() + "]";
		if (mUseBlastAdapter) {
		createBlastSurfaceControls(viewRoot, name, geometryTransaction);
		} else {
		mDeferredDestroySurfaceControl = createSurfaceControls(viewRoot, name);
		}
		} else if (mSurfaceControl == null) {
		return;
		}
		@@ -1237,11 +1212,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		*/
		private void copySurface(boolean surfaceControlCreated, boolean bufferSizeChanged) {
		if (surfaceControlCreated) {
		if (mUseBlastAdapter) {
		mSurface.copyFrom(mBlastBufferQueue);
		} else {
		mSurface.copyFrom(mSurfaceControl);
		}
		}

		if (bufferSizeChanged && getContext().getApplicationInfo().targetSdkVersion
		@@ -1251,28 +1222,21 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		// existing {@link Surface} will be ignored when the size changes.
		// Therefore, we must explicitly recreate the {@link Surface} in these
		// cases.
		if (mUseBlastAdapter) {
		if (mBlastBufferQueue != null) {
		mSurface.transferFrom(mBlastBufferQueue.createSurfaceWithHandle());
		}
		} else {
		mSurface.createFrom(mSurfaceControl);
		}
		}
		}

		private void setBufferSize(Transaction transaction) {
		if (mUseBlastAdapter) {
		mBlastSurfaceControl.setTransformHint(mTransformHint);
		if (mBlastBufferQueue != null) {
		mBlastBufferQueue.update(mBlastSurfaceControl, mSurfaceWidth, mSurfaceHeight,
		mFormat, transaction);
		}
		} else {
		transaction.setBufferSize(mSurfaceControl, mSurfaceWidth, mSurfaceHeight);
		}
		}


		/**
		* Creates the surface control hierarchy as follows
		* ViewRootImpl surface
		@@ -1290,40 +1254,12 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		* order. When the parent surface changes, we have to make sure to update the relative z via
		* ViewRootImpl.SurfaceChangedCallback.
		*
		* @return previous SurfaceControl where the content was rendered. In the surface is switched
		* out, the old surface can be persevered until the new one has drawn by keeping the reference
		* of the old SurfaceControl alive.
		* We don't recreate the surface controls but only recreate the adapter. Since the blast layer
		* is still alive, the old buffers will continue to be presented until replaced by buffers from
		* the new adapter. This means we do not need to track the old surface control and destroy it
		* after the client has drawn to avoid any flickers.
		*
		*/
		private SurfaceControl createSurfaceControls(ViewRootImpl viewRoot, String name) {
		final SurfaceControl previousSurfaceControl = mSurfaceControl;
		mSurfaceControl = new SurfaceControl.Builder(mSurfaceSession)
		.setName(name)
		.setLocalOwnerView(this)
		.setParent(viewRoot.getBoundsLayer())
		.setCallsite("SurfaceView.updateSurface")
		.setBufferSize(mSurfaceWidth, mSurfaceHeight)
		.setFlags(mSurfaceFlags)
		.setFormat(mFormat)
		.build();
		mBackgroundControl = createBackgroundControl(name);
		return previousSurfaceControl;
		}

		private SurfaceControl createBackgroundControl(String name) {
		return new SurfaceControl.Builder(mSurfaceSession)
		.setName("Background for " + name)
		.setLocalOwnerView(this)
		.setOpaque(true)
		.setColorLayer()
		.setParent(mSurfaceControl)
		.setCallsite("SurfaceView.updateSurface")
		.build();
		}

		// We don't recreate the surface controls but only recreate the adapter. Since the blast layer
		// is still alive, the old buffers will continue to be presented until replaced by buffers from
		// the new adapter. This means we do not need to track the old surface control and destroy it
		// after the client has drawn to avoid any flickers.
		private void createBlastSurfaceControls(ViewRootImpl viewRoot, String name,
		Transaction geometryTransaction) {
		if (mSurfaceControl == null) {
		@@ -1356,7 +1292,14 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		}

		if (mBackgroundControl == null) {
		mBackgroundControl = createBackgroundControl(name);
		mBackgroundControl = new SurfaceControl.Builder(mSurfaceSession)
		.setName("Background for " + name)
		.setLocalOwnerView(this)
		.setOpaque(true)
		.setColorLayer()
		.setParent(mSurfaceControl)
		.setCallsite("SurfaceView.updateSurface")
		.build();
		}

		// Always recreate the IGBP for compatibility. This can be optimized in the future but
		@@ -1436,8 +1379,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall

		private void applyOrMergeTransaction(Transaction t, long frameNumber) {
		final ViewRootImpl viewRoot = getViewRootImpl();
		boolean useBLAST = viewRoot != null && useBLASTSync(viewRoot);
		if (useBLAST) {
		if (viewRoot != null) {
		// If we are using BLAST, merge the transaction with the viewroot buffer transaction.
		viewRoot.mergeWithNextTransaction(t, frameNumber);
		} else {
		@@ -1939,14 +1881,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		return;
		}
		initEmbeddedHierarchyForAccessibility(p);
		final SurfaceControl parent;
		if (mUseBlastAdapter) {
		parent = mBlastSurfaceControl;
		} else {
		parent = mSurfaceControl;
		}

		t.reparent(sc, parent).show(sc);
		t.reparent(sc, mBlastSurfaceControl).show(sc);
		}

		/** @hide */
		@@ -2039,7 +1974,4 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		}
		}

		private boolean useBLASTSync(ViewRootImpl viewRoot) {
		return viewRoot.useBLAST() && mUseBlastAdapter && mUseBlastSync;
		}
		}

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -226,7 +226,6 @@ public class SettingsBackupTest {
		Settings.Global.DEVELOPMENT_FORCE_RTL,
		Settings.Global.DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW,
		Settings.Global.DEVELOPMENT_RENDER_SHADOWS_IN_COMPOSITOR,
		Settings.Global.DEVELOPMENT_USE_BLAST_ADAPTER_SV,
		Settings.Global.DEVELOPMENT_USE_BLAST_ADAPTER_VR,
		Settings.Global.DEVELOPMENT_WM_DISPLAY_SETTINGS_PATH,
		Settings.Global.DEVICE_DEMO_MODE,