commit 720e8244818178e337d774cc6bbc7c76fd34a3c9
author Rob Carr <racarr@google.com> Mon Nov 30 19:47:32 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 30 19:47:32 2020 +0000
tree b6c9fd80f883deb0455f3589dc5a3fc659f1265c
parent 15238e833d270bc7f5667134b183b8be820f3d53
parent 1af98ee6795d2f8058191a5124a228e49f97eaf0

Merge "SurfaceFlinger: Hold lock while constructing BufferStateLayer"

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 3059f6f..576bd50 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4035,7 +4035,14 @@
                                                 sp<Layer>* outLayer) {
     LayerCreationArgs args(this, client, std::move(name), w, h, flags, std::move(metadata));
     args.textureName = getNewTexture();
-    sp<BufferStateLayer> layer = getFactory().createBufferStateLayer(args);
+    sp<BufferStateLayer> layer;
+    {
+        // TODO (b/173538294): Investigate why we need mStateLock here and above in
+        // createBufferQueue layer. Is it the renderengine::Image?
+        Mutex::Autolock lock(mStateLock);
+        layer = getFactory().createBufferStateLayer(args);
+
+    }
     *handle = layer->getHandle();
     *outLayer = layer;