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

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

Browse Source 
am: 849302c0f1

Change-Id: I5eea2d35eec58ada02756f060374d2940198cbe1
This commit is contained in:
Santos Cordon
2017-04-06 20:30:08 +00:00
committed by android-build-merger
parent dc40c45d5b 849302c0f1
commit cc63fe5a0b
1 changed files with 9 additions and 4 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,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();