commit 046b72fc5d93aae3b47b88b9f6683512d01d75d0
author Jean-Baptiste Queru <jbq@google.com> Tue Aug 06 18:37:12 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 06 18:37:12 2013 +0000
tree c2aa83402c83a5711d486bbc6f3564c2be6c3fa6
parent 9f476fd08079701d1ad0f7c591667b6e673ed38e
parent e5886d917807d56fed07cd8e88b9be268d70368e

Merge "fix a possible deadlock when removing a layer and destroying a client"

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index ef0d521..e4d3c5f 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1037,6 +1037,12 @@
 {
     ATRACE_CALL();
 
+    // here we keep a copy of the drawing state (that is the state that's
+    // going to be overwritten by handleTransactionLocked()) outside of
+    // mStateLock so that the side-effects of the State assignment
+    // don't happen with mStateLock held (which can cause deadlocks).
+    State drawingState(mDrawingState);
+
     Mutex::Autolock _l(mStateLock);
     const nsecs_t now = systemTime();
     mDebugInTransaction = now;