commit ce0489d27441916e93c0565d06d1c0ea28d6921a
author Vishnu Nair <vishnun@google.com> Tue Sep 06 18:54:03 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 06 18:54:03 2022 +0000
tree b626dde97fcda62a7413a5fe06e2b86e6b92f5a4
parent abf5f9aa6a68462013e3c3f42bf38a65ca501460
parent 86e11906597167694ce1919c4c25d747f793112d

Merge "SurfaceFlinger: Fix layer creation race"

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index c4165e7..cc93db3 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3572,15 +3572,16 @@
         return NO_MEMORY;
     }
 
+    layer->updateTransformHint(mActiveDisplayTransformHint);
+    if (outTransformHint) {
+        *outTransformHint = mActiveDisplayTransformHint;
+    }
+
     {
         std::scoped_lock<std::mutex> lock(mCreatedLayersLock);
         mCreatedLayers.emplace_back(layer, parent, addToRoot);
     }
 
-    layer->updateTransformHint(mActiveDisplayTransformHint);
-    if (outTransformHint) {
-        *outTransformHint = mActiveDisplayTransformHint;
-    }
     // attach this layer to the client
     if (client != nullptr) {
         client->attachLayer(handle, layer);