SF: Fix an EventThread deadlock
EventThread::removeDisplayEventConnection tried to acquire the mutex,
however the caller (eventThread::threadMain()) already had it.
The fix was to not acquire the mutex, since threadMain() was the only
caller.
Bug: 73256320
Test: Can toggle "Show taps" from dev options without lockup.
Change-Id: I855b19b3d0ac9e0ea05604cc7b077f4a5030a00b
diff --git a/services/surfaceflinger/EventThread.h b/services/surfaceflinger/EventThread.h
index 708806a..97f0a35 100644
--- a/services/surfaceflinger/EventThread.h
+++ b/services/surfaceflinger/EventThread.h
@@ -129,7 +129,7 @@
DisplayEventReceiver::Event* event)
REQUIRES(mMutex);
- void removeDisplayEventConnection(const wp<Connection>& connection);
+ void removeDisplayEventConnectionLocked(const wp<Connection>& connection) REQUIRES(mMutex);
void enableVSyncLocked() REQUIRES(mMutex);
void disableVSyncLocked() REQUIRES(mMutex);