summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2012-04-18 18:33:19 -0700
committer Mathias Agopian <mathias@google.com> 2012-04-18 18:36:25 -0700
commit56a2bbe70876c1ac4e18b3740722c01d69bca2fd (patch)
tree6198f905da105bd022269650627986bc8c5aa3c3
parent9798ff28b80051185e432230000eb663d3cc8453 (diff)
SF needs to render even if we don't have a h/w composer
Bug: 6350574, 6361055 Change-Id: Iab92cc31bab4771fca63619c8e3105c759535f72
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index f220de3991..0d4d2b97ae 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -892,9 +892,10 @@ void SurfaceFlinger::composeSurfaces(const Region& dirty)
{
const DisplayHardware& hw(graphicPlane(0).displayHardware());
HWComposer& hwc(hw.getHwComposer());
+ hwc_layer_t* const cur(hwc.getLayers());
const size_t fbLayerCount = hwc.getLayerCount(HWC_FRAMEBUFFER);
- if (fbLayerCount) {
+ if (!cur || fbLayerCount) {
// Never touch the framebuffer if we don't have any framebuffer layers
if (hwc.getLayerCount(HWC_OVERLAY)) {
@@ -917,7 +918,6 @@ void SurfaceFlinger::composeSurfaces(const Region& dirty)
* and then, render the layers targeted at the framebuffer
*/
- hwc_layer_t* const cur(hwc.getLayers());
const Vector< sp<LayerBase> >& layers(mVisibleLayersSortedByZ);
const size_t count = layers.size();