Merge "Revert "Remove SystemProperty gating-flag for virtual displays."" into oc-dev (cc63fe5a) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/vr/CompatibilityDisplay.java

+9 −4

Original line number	Diff line number	Diff line
		@@ -95,15 +95,20 @@ class CompatibilityDisplay {
		* Creates and Destroys the virtual display depending on the current state of VrMode.
		*/
		private void updateVirtualDisplay() {
		boolean createVirtualDisplay = "true".equals(SystemProperties.get("vr_virtualdisplay"));
		if (DEBUG) {
		Log.i(TAG, "isVrMode: " + mIsVrModeEnabled + ", override: " + mIsVrModeOverrideEnabled);
		Log.i(TAG, "isVrMode: " + mIsVrModeEnabled + ", createVD: " + createVirtualDisplay +
		", override: " + mIsVrModeOverrideEnabled);
		}

		if (mIsVrModeEnabled \|\| mIsVrModeOverrideEnabled) {
		if (mIsVrModeEnabled \|\| (createVirtualDisplay && mIsVrModeOverrideEnabled)) {
		// TODO: Consider not creating the display until ActivityManager needs one on
		// which to display a 2D application.
		// TODO: STOPSHIP Remove createVirtualDisplay conditional before launching.
		if (createVirtualDisplay) {
		startVirtualDisplay();
		startImageReader();
		}
		} else {
		// Stop virtual display to test exit condition
		stopVirtualDisplay();