From abcc8e54f636bd4eaff5f85d54d5ff8b75508bb9 Mon Sep 17 00:00:00 2001
From: Santos Cordon <santoscordon@google.com>
Date: Mon, 3 Apr 2017 12:27:21 -0700
Subject: [PATCH] Remove SystemProperty gating-flag for virtual displays.

Virtual Display creating previously gated by SystemProperty.  This CL
removes it.

Test: Go into VR, run an app, ensure that the app is running within a
virtual display via "adb shell am stack list".

Change-Id: I10e8483cea3dc785eb448811b3ba96b8b8624f93
---
 .../com/android/server/vr/CompatibilityDisplay.java | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/services/core/java/com/android/server/vr/CompatibilityDisplay.java b/services/core/java/com/android/server/vr/CompatibilityDisplay.java
index ae1d50ff1f718..772fc2653e776 100644
--- a/services/core/java/com/android/server/vr/CompatibilityDisplay.java
+++ b/services/core/java/com/android/server/vr/CompatibilityDisplay.java
@@ -95,20 +95,15 @@ 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 + ", createVD: " + createVirtualDisplay +
-                    ", override: " + mIsVrModeOverrideEnabled);
+            Log.i(TAG, "isVrMode: " + mIsVrModeEnabled + ", override: " + mIsVrModeOverrideEnabled);
         }
 
-        if (mIsVrModeEnabled || (createVirtualDisplay && mIsVrModeOverrideEnabled)) {
+        if (mIsVrModeEnabled || 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();
-            }
+            startVirtualDisplay();
+            startImageReader();
         } else {
             // Stop virtual display to test exit condition
             stopVirtualDisplay();