commit d85333ddca0f8046d1c7553ac611f579a2a0c6fa
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Dec 18 05:25:16 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 18 05:25:16 2018 +0000
tree 0bcca35cb29cb54a2b5436592200507c67eb900c
parent 653ab3ad74c5105d5e630a90ec17f6b7b80b1d3d
parent b770ed33f6c9a0b3872b75b4e8a239b0209ab686

Merge "SurfaceFlinger: Fix triple buffering variable naming confusion"

services/surfaceflinger/BufferQueueLayer.cpp

diff --git a/services/surfaceflinger/BufferQueueLayer.cpp b/services/surfaceflinger/BufferQueueLayer.cpp
index 70d52f1..3341b98 100644
--- a/services/surfaceflinger/BufferQueueLayer.cpp
+++ b/services/surfaceflinger/BufferQueueLayer.cpp
@@ -454,7 +454,8 @@
     mConsumer->setContentsChangedListener(this);
     mConsumer->setName(mName);
 
-    if (mFlinger->isLayerTripleBufferingDisabled()) {
+    // BufferQueueCore::mMaxDequeuedBufferCount is default to 1
+    if (!mFlinger->isLayerTripleBufferingDisabled()) {
         mProducer->setMaxDequeuedBufferCount(2);
     }
 

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index a5ba054..20e7f70 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -379,7 +379,7 @@
     mUseHwcVirtualDisplays = atoi(value);
     ALOGI_IF(mUseHwcVirtualDisplays, "Enabling HWC virtual displays");
 
-    property_get("ro.sf.disable_triple_buffer", value, "1");
+    property_get("ro.sf.disable_triple_buffer", value, "0");
     mLayerTripleBufferingDisabled = atoi(value);
     ALOGI_IF(mLayerTripleBufferingDisabled, "Disabling Triple Buffering");