we were mistakenly optimizing out SF's main transactions in some cases

due to a typo, SF's main transaction was conditional to having a
display transaction.

more correct fix for 6970310

Bug: 6970310
Change-Id: Iafd8c4e02afa5db829cc1c65950cfcc74754c6af

1 files changed, 30 insertions, 27 deletions

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 97b02ce600..2b9ae06f2a 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -891,8 +891,7 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags)
      * (perform the transaction for each of them if needed)
      */
 
-    const bool layersNeedTransaction = transactionFlags & eTraversalNeeded;
-    if (layersNeedTransaction) {
+    if (transactionFlags & eTraversalNeeded) {
         for (size_t i=0 ; i<count ; i++) {
             const sp<LayerBase>& layer = currentLayers[i];
             uint32_t trFlags = layer->getTransactionFlags(eTransactionNeeded);
@@ -905,7 +904,7 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags)
     }
 
     /*
-     * Perform our own transaction if needed
+     * Perform display own transactions if needed
      */
 
     if (transactionFlags & eDisplayTransactionNeeded) {
@@ -978,31 +977,35 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags)
                 }
             }
         }
+    }
 
-        if (currentLayers.size() > mDrawingState.layersSortedByZ.size()) {
-            // layers have been added
-            mVisibleRegionsDirty = true;
-        }
+    /*
+     * Perform our own transaction if needed
+     */
 
-        // some layers might have been removed, so
-        // we need to update the regions they're exposing.
-        if (mLayersRemoved) {
-            mLayersRemoved = false;
-            mVisibleRegionsDirty = true;
-            const LayerVector& previousLayers(mDrawingState.layersSortedByZ);
-            const size_t count = previousLayers.size();
-            for (size_t i=0 ; i<count ; i++) {
-                const sp<LayerBase>& layer(previousLayers[i]);
-                if (currentLayers.indexOf(layer) < 0) {
-                    // this layer is not visible anymore
-                    // TODO: we could traverse the tree from front to back and
-                    //       compute the actual visible region
-                    // TODO: we could cache the transformed region
-                    Layer::State front(layer->drawingState());
-                    Region visibleReg = front.transform.transform(
-                            Region(Rect(front.active.w, front.active.h)));
-                    invalidateLayerStack(front.layerStack, visibleReg);
-                }
+    if (currentLayers.size() > mDrawingState.layersSortedByZ.size()) {
+        // layers have been added
+        mVisibleRegionsDirty = true;
+    }
+
+    // some layers might have been removed, so
+    // we need to update the regions they're exposing.
+    if (mLayersRemoved) {
+        mLayersRemoved = false;
+        mVisibleRegionsDirty = true;
+        const LayerVector& previousLayers(mDrawingState.layersSortedByZ);
+        const size_t count = previousLayers.size();
+        for (size_t i=0 ; i<count ; i++) {
+            const sp<LayerBase>& layer(previousLayers[i]);
+            if (currentLayers.indexOf(layer) < 0) {
+                // this layer is not visible anymore
+                // TODO: we could traverse the tree from front to back and
+                //       compute the actual visible region
+                // TODO: we could cache the transformed region
+                Layer::State front(layer->drawingState());
+                Region visibleReg = front.transform.transform(
+                        Region(Rect(front.active.w, front.active.h)));
+                invalidateLayerStack(front.layerStack, visibleReg);
             }
         }
     }
@@ -1406,7 +1409,7 @@ status_t SurfaceFlinger::removeLayer(const sp<LayerBase>& layer)
     Mutex::Autolock _l(mStateLock);
     status_t err = purgatorizeLayer_l(layer);
     if (err == NO_ERROR)
-        setTransactionFlags(eDisplayTransactionNeeded);
+        setTransactionFlags(eTransactionNeeded);
     return err;
 }