diff options
| author | 2017-02-10 02:40:36 +0000 | |
|---|---|---|
| committer | 2017-02-10 02:40:38 +0000 | |
| commit | bb5afada05e597b8a74e3888863319c319c3c944 (patch) | |
| tree | 59f833d019881c839a65f2493cca017f1a54943e | |
| parent | 01dc4ad329e617ef2d835528f9ce7b1e87a7900f (diff) | |
| parent | 642b23d70f7b513e88680c1d8400c1c1cfe6edd3 (diff) | |
Merge "Disable Virtual Display by default in SF"
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 6 | ||||
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.h | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger_hwc1.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 6289bdb280..8af03577d2 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -215,9 +215,9 @@ SurfaceFlinger::SurfaceFlinger() mPropagateBackpressure = !atoi(value); ALOGI_IF(!mPropagateBackpressure, "Disabling backpressure propagation"); - property_get("debug.sf.disable_hwc_vds", value, "0"); - mUseHwcVirtualDisplays = !atoi(value); - ALOGI_IF(!mUseHwcVirtualDisplays, "Disabling HWC virtual displays"); + property_get("debug.sf.enable_hwc_vds", value, "0"); + mUseHwcVirtualDisplays = atoi(value); + ALOGI_IF(!mUseHwcVirtualDisplays, "Enabling HWC virtual displays"); property_get("ro.sf.disable_triple_buffer", value, "0"); mLayerTripleBufferingDisabled = !atoi(value); diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h index 384e345f50..6dfdf0874d 100644 --- a/services/surfaceflinger/SurfaceFlinger.h +++ b/services/surfaceflinger/SurfaceFlinger.h @@ -561,7 +561,7 @@ private: bool mPropagateBackpressure = true; #endif SurfaceInterceptor mInterceptor; - bool mUseHwcVirtualDisplays = true; + bool mUseHwcVirtualDisplays = false; // Restrict layers to use two buffers in their bufferqueues. bool mLayerTripleBufferingDisabled = false; diff --git a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp index fe9ba9695a..faa68e8fcd 100644 --- a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp +++ b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp @@ -188,9 +188,9 @@ SurfaceFlinger::SurfaceFlinger() ALOGI_IF(mDebugRegion, "showupdates enabled"); ALOGI_IF(mDebugDDMS, "DDMS debugging enabled"); - property_get("debug.sf.disable_hwc_vds", value, "0"); - mUseHwcVirtualDisplays = !atoi(value); - ALOGI_IF(!mUseHwcVirtualDisplays, "Disabling HWC virtual displays"); + property_get("debug.sf.enable_hwc_vds", value, "0"); + mUseHwcVirtualDisplays = atoi(value); + ALOGI_IF(!mUseHwcVirtualDisplays, "Enabling HWC virtual displays"); property_get("ro.sf.disable_triple_buffer", value, "0"); mLayerTripleBufferingDisabled = !atoi(value); |