commit 542283a1b5e0877261a10bbd57a9671273683133
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jun 11 06:38:32 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jun 11 06:38:32 2022 +0000
tree f7dab6c743c31ddc84cf8e706c7b859ec0c63705
parent 2600208a1609a06105d958528dc1178dbcb3fa31
parent 9acc1bf5ec8788016b268a7bbbbf116b99050a7b

Merge cherrypicks of [18766116] into rvc-platform-release.

Change-Id: I76d22b5d83a203901d0fd40bf1a4bd91e3cf3a5e

services/surfaceflinger/Scheduler/EventThread.cpp

diff --git a/services/surfaceflinger/Scheduler/EventThread.cpp b/services/surfaceflinger/Scheduler/EventThread.cpp
index 845bf50..c116dae 100644
--- a/services/surfaceflinger/Scheduler/EventThread.cpp
+++ b/services/surfaceflinger/Scheduler/EventThread.cpp
@@ -138,6 +138,11 @@
 }
 
 status_t EventThreadConnection::stealReceiveChannel(gui::BitTube* outChannel) {
+    std::scoped_lock lock(mLock);
+    if (mChannel.initCheck() != NO_ERROR) {
+        return NAME_NOT_FOUND;
+    }
+
     outChannel->setReceiveFd(mChannel.moveReceiveFd());
     outChannel->setSendFd(base::unique_fd(dup(mChannel.getSendFd())));
     return NO_ERROR;

services/surfaceflinger/Scheduler/EventThread.h

diff --git a/services/surfaceflinger/Scheduler/EventThread.h b/services/surfaceflinger/Scheduler/EventThread.h
index 49f624c..df7fb7d 100644
--- a/services/surfaceflinger/Scheduler/EventThread.h
+++ b/services/surfaceflinger/Scheduler/EventThread.h
@@ -92,7 +92,8 @@
 private:
     virtual void onFirstRef();
     EventThread* const mEventThread;
-    gui::BitTube mChannel;
+    std::mutex mLock;
+    gui::BitTube mChannel GUARDED_BY(mLock);
 };
 
 class EventThread {