From 5dc6019bb423f662685b026e65779ebd8897c7c2 Mon Sep 17 00:00:00 2001
From: Santos Cordon <santoscordon@google.com>
Date: Tue, 9 May 2017 11:36:53 -0700
Subject: [PATCH] Remove system properties that gates virtual displays in VR.

Bug: 38165337
Test: Manual - Run VR and ensure that secondary display is
listed in 'adb shell dumpsys displays'.

Change-Id: Icf19b7da87bbc89a68f1d77e42c02a93674f7990
---
 .../android/server/{ => vr}/Vr2dDisplay.java  | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)
 rename services/core/java/com/android/server/{ => vr}/Vr2dDisplay.java (92%)

diff --git a/services/core/java/com/android/server/Vr2dDisplay.java b/services/core/java/com/android/server/vr/Vr2dDisplay.java
similarity index 92%
rename from services/core/java/com/android/server/Vr2dDisplay.java
rename to services/core/java/com/android/server/vr/Vr2dDisplay.java
index f9bcb01b8c7bb..4a1297f8af71c 100644
--- a/services/core/java/com/android/server/Vr2dDisplay.java
+++ b/services/core/java/com/android/server/vr/Vr2dDisplay.java
@@ -123,19 +123,14 @@ class Vr2dDisplay {
      * 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();
-            }
+            startVirtualDisplay();
         } else {
             // Stop virtual display to test exit condition
             stopVirtualDisplay();
@@ -150,9 +145,7 @@ class Vr2dDisplay {
      * @param context The context.
      */
     private void startDebugOnlyBroadcastReceiver(Context context) {
-        // STOPSHIP: remove vr_debug_vd_receiver test.
-        boolean debugBroadcast = "true".equals(SystemProperties.get("vr_debug_vd_receiver"));
-        if (DEBUG || debugBroadcast) {
+        if (DEBUG) {
             IntentFilter intentFilter = new IntentFilter(DEBUG_ACTION_SET_MODE);
             intentFilter.addAction(DEBUG_ACTION_SET_SURFACE);
 
@@ -203,18 +196,20 @@ class Vr2dDisplay {
     public void setVirtualDisplayProperties(Vr2dDisplayProperties compatDisplayProperties) {
         synchronized(mVdLock) {
             if (DEBUG) {
-                Log.i(TAG, "VD setVirtualDisplayProperties: res = " +
-                        compatDisplayProperties.getWidth() + "X" + compatDisplayProperties.getHeight() +
-                        ", dpi = " + compatDisplayProperties.getDpi());
+                Log.i(TAG, "VD setVirtualDisplayProperties: res = "
+                        + compatDisplayProperties.getWidth() + "X"
+                        + compatDisplayProperties.getHeight() + ", dpi = "
+                        + compatDisplayProperties.getDpi());
             }
 
             if (compatDisplayProperties.getWidth() < MIN_VR_DISPLAY_WIDTH ||
                 compatDisplayProperties.getHeight() < MIN_VR_DISPLAY_HEIGHT ||
                 compatDisplayProperties.getDpi() < MIN_VR_DISPLAY_DPI) {
                 throw new IllegalArgumentException (
-                        "Illegal argument: height, width, dpi cannot be negative. res = " +
-                        compatDisplayProperties.getWidth() + "X" + compatDisplayProperties.getHeight() +
-                        ", dpi = " + compatDisplayProperties.getDpi());
+                        "Illegal argument: height, width, dpi cannot be negative. res = "
+                        + compatDisplayProperties.getWidth() + "X"
+                        + compatDisplayProperties.getHeight()
+                        + ", dpi = " + compatDisplayProperties.getDpi());
             }
 
             mVirtualDisplayWidth = compatDisplayProperties.getWidth();