commit a6b32db164e7834e211261046f3229bf50bc0098
author Jesse Hall <jessehall@google.com> Thu Jul 19 16:44:38 2012 -0700
committer Jesse Hall <jessehall@google.com> Fri Jul 20 11:46:58 2012 -0700
tree b1a02a6d1369774b1f9319d052a7606356d1bc0f
parent a49126087b4494f4ef50873f3a3f6727265f6621

Handle empty HWC layer list when composing

Bug: 6777877
Change-Id: I71e9b948d04dda33d45cfa986d9c7e28328cf749

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 29ec1a7..693f241 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1151,11 +1151,11 @@
         const Vector< sp<LayerBase> >& layers(hw.getVisibleLayersSortedByZ());
         const size_t count = layers.size();
         const Transform& tr = hw.getTransform();
-        for (size_t i=0 ; cur!=end && i<count ; ++i, ++cur) {
+        for (size_t i=0 ; i<count ; ++i) {
             const sp<LayerBase>& layer(layers[i]);
             const Region clip(dirty.intersect(tr.transform(layer->visibleRegion)));
             if (!clip.isEmpty()) {
-                if (cur->getCompositionType() == HWC_OVERLAY) {
+                if (cur != end && cur->getCompositionType() == HWC_OVERLAY) {
                     if (i && (cur->getHints() & HWC_HINT_CLEAR_FB)
                             && layer->isOpaque()) {
                         // never clear the very first layer since we're
@@ -1167,6 +1167,9 @@
                 // render the layer
                 layer->draw(hw, clip);
             }
+            if (cur != end) {
+                ++cur;
+            }
         }
     }
 }