commit bdeb67fdee6256391a5ad3cf8dfe65b364e54038
author Linux Build Service Account <lnxbuild@localhost> Sat Jan 31 09:01:01 2015 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Jan 31 09:01:01 2015 -0800
tree a858c92a64749af9000c2daf612f83bfdd7dd663
parent 92fa6436c8f86c346bbd627df244846e735c2a64
parent 7b99776b7834a4c0fce08018cc0a969e9cdbd2cc

Merge "libgui: Copyback all region except dirty region for newly allocated buffer"

libs/gui/BufferQueueConsumer.cpp

diff --git a/libs/gui/BufferQueueConsumer.cpp b/libs/gui/BufferQueueConsumer.cpp
index 73de186..76a826e 100644
--- a/libs/gui/BufferQueueConsumer.cpp
+++ b/libs/gui/BufferQueueConsumer.cpp
@@ -92,7 +92,7 @@
         // be discarded based on them.
 #ifdef QCOM_BSP
         char property[PROPERTY_VALUE_MAX];
-        if (property_get("sf.default.app_buffer_count", property, NULL) > 0) {
+        if (property_get("hw.sf.app_buff_count", property, NULL) > 0) {
            if (!mCore->mQueue[0].mIsAutoTimestamp && mCore->mDefaultMaxBufferCount < 3) {
               const BufferItem& bufferItem(mCore->mQueue[0]);
               nsecs_t desiredPresent = bufferItem.mTimestamp;

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 65f9baf..643c7e6 100755
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -164,7 +164,7 @@
 
 #ifdef QCOM_BSP
     char property[PROPERTY_VALUE_MAX];
-    if (property_get("sf.default.app_buffer_count", property, NULL) > 0) {
+    if (property_get("hw.sf.app_buff_count", property, NULL) > 0) {
         mSurfaceFlingerConsumer->setDefaultMaxBufferCount(atoi(property));
     }
 #endif