commit 1686374dbe5cae834fa206f0bdba5637de7aa5fd
author Dominik Laskowski <domlaskowski@google.com> Thu Sep 29 11:57:40 2022 -0400
committer Dominik Laskowski <domlaskowski@google.com> Fri Mar 10 14:45:09 2023 -0500
tree 388eff7f85c0ebe2f2968500660b62cdefc3f726
parent 14956dc43288483d823f07786349278f3e46cbe1

SF: Commit initial DisplayState under lock

The main thread must `applyTransactions` under `mStateLock` during
`onInitializeDisplays`, since a Binder thread could be concurrently
writing to `mCurrentState.displays` while creating or destroying a
virtual display.

Fixes: 244460929
Test: Boot (sporadic crash with no repro steps)
Change-Id: I4f8bac4af7635b9b93c7b79826285a26a109cf9e

services/surfaceflinger/SurfaceFlinger.h

diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index 0d297b9..3593deb 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -857,7 +857,7 @@
 
     // Called during boot, and restart after system_server death.
     void initializeDisplays();
-    void onInitializeDisplays() REQUIRES(mStateLock, kMainThreadContext);
+    void onInitializeDisplays() REQUIRES(kMainThreadContext);
 
     sp<const DisplayDevice> getDisplayDeviceLocked(const wp<IBinder>& displayToken) const
             REQUIRES(mStateLock) {