Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove SystemProperty gating-flag for virtual displays." into oc-dev

Browse Source
This commit is contained in:
Santos Cordon
2017-04-06 01:48:06 +00:00
committed by Android (Google) Code Review
parent 781fdfaf5b abcc8e54f6
commit 54d488d4b7
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/vr/CompatibilityDisplay.java
View File

@@ -95,20 +95,15 @@ class CompatibilityDisplay {
* Creates and Destroys the virtual display depending on the current state of VrMode. * Creates and Destroys the virtual display depending on the current state of VrMode.
*/ */
private void updateVirtualDisplay() { private void updateVirtualDisplay() {
boolean createVirtualDisplay = "true".equals(SystemProperties.get("vr_virtualdisplay"));
if (DEBUG) { if (DEBUG) {
Log.i(TAG, "isVrMode: " + mIsVrModeEnabled + ", createVD: " + createVirtualDisplay + Log.i(TAG, "isVrMode: " + mIsVrModeEnabled + ", override: " + mIsVrModeOverrideEnabled);
", override: " + mIsVrModeOverrideEnabled);
} }
if (mIsVrModeEnabled || (createVirtualDisplay && mIsVrModeOverrideEnabled)) { if (mIsVrModeEnabled || mIsVrModeOverrideEnabled) {
// TODO: Consider not creating the display until ActivityManager needs one on // TODO: Consider not creating the display until ActivityManager needs one on
// which to display a 2D application. // which to display a 2D application.
// TODO: STOPSHIP Remove createVirtualDisplay conditional before launching. startVirtualDisplay();
if (createVirtualDisplay) { startImageReader();
startVirtualDisplay();
startImageReader();
}
} else { } else {
// Stop virtual display to test exit condition // Stop virtual display to test exit condition
stopVirtualDisplay(); stopVirtualDisplay();