commit 3e3474eaadc5a1ed345bb866f1469e5a4658327e
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 10 20:49:58 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 10 20:49:58 2017 +0000
tree 02b51af99d10f375becf1ad33808d433d3841399
parent 4e67f0f8c13c4777bccbcd527ff18584c3ccc93a
parent 7f9b899c33c5d69597bc676c0bee828819c97a0f

Merge "Re-add mistakenly removed lock in SurfaceFlinger::removeLayer."

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index e2cc834..ca6d941 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2519,6 +2519,8 @@
 }
 
 status_t SurfaceFlinger::removeLayer(const sp<Layer>& layer) {
+    Mutex::Autolock _l(mStateLock);
+
     const auto& p = layer->getParent();
     const ssize_t index = (p != nullptr) ? p->removeChild(layer) :
         mCurrentState.layersSortedByZ.remove(layer);

services/surfaceflinger/SurfaceFlinger_hwc1.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp
index 7d2444a..147232c 100644
--- a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp
+++ b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp
@@ -2296,6 +2296,8 @@
 }
 
 status_t SurfaceFlinger::removeLayer(const sp<Layer>& layer) {
+    Mutex::Autolock _l(mStateLock);
+
     const auto& p = layer->getParent();
     const ssize_t index = (p != nullptr) ? p->removeChild(layer) :
              mCurrentState.layersSortedByZ.remove(layer);