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

Merge "Remove system properties that gates virtual displays in VR." into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-11 08:07:40 +00:00
committed by Android (Google) Code Review
parent d5e72b250f 5dc6019bb4
commit c3440d30c1
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
services/core/java/com/android/server/Vr2dDisplay.java → services/core/java/com/android/server/vr/Vr2dDisplay.java
View File

@@ -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();