commit 92c3a307d3ce3ec7a8808d6a2cbb324c0526ac5b
author Mathias Agopian <mathias@google.com> Mon Nov 19 15:22:04 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 19 15:22:04 2012 -0800
tree c73ca0e812788dc73dfb5e8cebae5bb053799846
parent 1d3612f11cb0a56062059dad4643657750c23aab
parent 3e095b251503d71bea04d6b707e8188cd30034e2

am 3e095b25: workaround: don\'t reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]

* commit '3e095b251503d71bea04d6b707e8188cd30034e2':
  workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 29b778d..2eb74b7 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -804,7 +804,7 @@
         getLayer()->acquireFenceFd = fenceFd;
     }
     virtual void setPerFrameDefaultState() {
-        getLayer()->compositionType = HWC_FRAMEBUFFER;
+        //getLayer()->compositionType = HWC_FRAMEBUFFER;
     }
     virtual void setDefaultState() {
         getLayer()->compositionType = HWC_FRAMEBUFFER;