Merge "Flip BLAST flag." (3a20a22e) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -9757,6 +9757,14 @@ public final class Settings {
		public static final String DEVELOPMENT_RENDER_SHADOWS_IN_COMPOSITOR =
		"render_shadows_in_compositor";

		/**
		* If true, submit buffers using blast in ViewRootImpl.
		* (0 = false, 1 = true)
		* @hide
		*/
		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)

+1 −0

Original line number	Diff line number	Diff line
		@@ -229,6 +229,7 @@ public class SettingsBackupTest {
		Settings.Global.DEVELOPMENT_ENABLE_SIZECOMPAT_FREEFORM,
		Settings.Global.DEVELOPMENT_RENDER_SHADOWS_IN_COMPOSITOR,
		Settings.Global.DEVELOPMENT_USE_BLAST_ADAPTER_SV,
		Settings.Global.DEVELOPMENT_USE_BLAST_ADAPTER_VR,
		Settings.Global.DEVICE_DEMO_MODE,
		Settings.Global.BATTERY_SAVER_ADAPTIVE_CONSTANTS,
		Settings.Global.BATTERY_SAVER_CONSTANTS,

+3 −4

Original line number	Diff line number	Diff line
		@@ -1218,9 +1218,9 @@ public class WindowManagerService extends IWindowManager.Stub
		mAnimator = new WindowAnimator(this);
		mRoot = new RootWindowContainer(this);

		mUseBLAST = DeviceConfig.getBoolean(
		DeviceConfig.NAMESPACE_WINDOW_MANAGER_NATIVE_BOOT,
		WM_USE_BLAST_ADAPTER_FLAG, false);
		final ContentResolver resolver = context.getContentResolver();
		mUseBLAST = Settings.Global.getInt(resolver,
		Settings.Global.DEVELOPMENT_USE_BLAST_ADAPTER_VR, 1) == 1;

		mSyncEngine = new BLASTSyncEngine(this);

		@@ -1298,7 +1298,6 @@ public class WindowManagerService extends IWindowManager.Stub
		}
		}, UserHandle.ALL, suspendPackagesFilter, null, null);

		final ContentResolver resolver = context.getContentResolver();
		// Get persisted window scale setting
		mWindowAnimationScaleSetting = Settings.Global.getFloat(resolver,
		Settings.Global.WINDOW_ANIMATION_SCALE, mWindowAnimationScaleSetting);