commit ae56a32be71278b77e82fe56bcfbdc9589f7e1dc
author Dan Stoza <stoza@google.com> Tue Aug 09 23:38:10 2016 +0000
committer Dan Stoza <stoza@google.com> Tue Aug 09 23:38:23 2016 +0000
tree 04dd6ed5b4355217b4c9ef97f8955dc72ef95990
parent b669dfdbf2effb7f116a29e610181323a2d87c10

Revert "SF: Fix a couple of Layer ref count issues"

This reverts commit 92cd24e5f648175944deef5899258981807a9ca4.

Change-Id: I551c292d8151d39bd34f2667eda384273f7cfd87

services/surfaceflinger/Client.cpp

diff --git a/services/surfaceflinger/Client.cpp b/services/surfaceflinger/Client.cpp
index e14a59b..415bdca 100644
--- a/services/surfaceflinger/Client.cpp
+++ b/services/surfaceflinger/Client.cpp
@@ -43,7 +43,10 @@
 {
     const size_t count = mLayers.size();
     for (size_t i=0 ; i<count ; i++) {
-        mFlinger->removeLayer(mLayers.valueAt(i));
+        sp<Layer> layer(mLayers.valueAt(i).promote());
+        if (layer != 0) {
+            mFlinger->removeLayer(layer);
+        }
     }
 }