commit c763303eca5acf56a6d45157106d6277fb0887ab
author Mathias Agopian <mathias@google.com> Mon Nov 19 15:23:36 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 19 15:23:36 2012 -0800
tree 5d20c854093e240b22761993abd1c25bc395709d
parent c208cdd402d767228a34074d589c6368cc656b7d
parent 92c3a307d3ce3ec7a8808d6a2cbb324c0526ac5b

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

* commit '92c3a307d3ce3ec7a8808d6a2cbb324c0526ac5b':
  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;