diff options
| -rw-r--r-- | services/core/java/com/android/server/vr/CompatibilityDisplay.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/vr/CompatibilityDisplay.java b/services/core/java/com/android/server/vr/CompatibilityDisplay.java index 772fc2653e77..ae1d50ff1f71 100644 --- a/services/core/java/com/android/server/vr/CompatibilityDisplay.java +++ b/services/core/java/com/android/server/vr/CompatibilityDisplay.java @@ -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. - startVirtualDisplay(); - startImageReader(); + // TODO: STOPSHIP Remove createVirtualDisplay conditional before launching. + if (createVirtualDisplay) { + startVirtualDisplay(); + startImageReader(); + } } else { // Stop virtual display to test exit condition stopVirtualDisplay(); |