From da90bd1fc7cf9b8f4c5e7222a8e2e65bcd84096c Mon Sep 17 00:00:00 2001
From: Santos Cordon <santoscordon@google.com>
Date: Thu, 6 Apr 2017 18:06:31 +0000
Subject: [PATCH] Revert "Remove SystemProperty gating-flag for virtual
 displays."

Test team is still relying on this.  We'll keep this until the virtual display input code goes in this week.

This reverts commit abcc8e54f636bd4eaff5f85d54d5ff8b75508bb9.

Change-Id: Ic591f813289191b09367a76be3221183562256a7
---
 .../com/android/server/vr/CompatibilityDisplay.java | 13 +++++++++----
 1 file 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 772fc2653e776..ae1d50ff1f718 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();