From 55882dea1b1b305f15192b96ff7814f18babb212 Mon Sep 17 00:00:00 2001
From: Mathias Agopian <mathias@google.com>
Date: Wed, 5 Sep 2012 16:00:56 -0700
Subject: [PATCH] fix a problem where  all hwc layers would have the SKIP flags
 set

the problem was that LayerBase::setPerFrameData() was always setting
this flag. in fact there was no reason to do this at that point since
the layer is initialized to a default state in setGeometry().

Bug: 7111259
Change-Id: Ib37b0dd7391a6163070e9aca025512159c1705f9
---
 services/surfaceflinger/DisplayHardware/HWComposer.cpp | 1 +
 services/surfaceflinger/LayerBase.cpp                  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 113c26ca3..dca27baa2 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -546,6 +546,7 @@ public:
         getLayer()->compositionType = HWC_FRAMEBUFFER;
         getLayer()->hints = 0;
         getLayer()->flags = HWC_SKIP_LAYER;
+        getLayer()->handle = 0;
         getLayer()->transform = 0;
         getLayer()->blending = HWC_BLENDING_NONE;
         getLayer()->visibleRegionScreen.numRects = 0;
diff --git a/services/surfaceflinger/LayerBase.cpp b/services/surfaceflinger/LayerBase.cpp
index 87dc572aa..311d95fce 100644
--- a/services/surfaceflinger/LayerBase.cpp
+++ b/services/surfaceflinger/LayerBase.cpp
@@ -292,7 +292,6 @@ void LayerBase::setGeometry(
 
 void LayerBase::setPerFrameData(const sp<const DisplayDevice>& hw,
         HWComposer::HWCLayerInterface& layer) {
-    layer.setBuffer(0);
     // we have to set the visible region on every frame because
     // we currently free it during onLayerDisplayed(), which is called
     // after HWComposer::commit() -- every frame.