| commit | 13ba6f3c3fef163b74f33092cdd3ed63c25e2bb3 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Tue Sep 28 17:19:46 2021 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Sep 28 17:19:46 2021 +0000 |
| tree | b9b69b53d0db29364441f19e4f89deb850299106 | |
| parent | 76473a118dea4212397eeb8ed89b2a31e980c857 [diff] | |
| parent | ab3f442e84cbb7dfd21197ee452c3b480eda481f [diff] |
Merge "libbinder: RPC avoid FdTrigger shutdown race"
diff --git a/libs/binder/RpcServer.cpp b/libs/binder/RpcServer.cpp index 5733993..4c61a59 100644 --- a/libs/binder/RpcServer.cpp +++ b/libs/binder/RpcServer.cpp
@@ -205,8 +205,11 @@ } mShutdownTrigger->trigger(); + for (auto& [id, session] : mSessions) { (void)id; + // server lock is a more general lock + std::lock_guard<std::mutex> _lSession(session->mMutex); session->mShutdownTrigger->trigger(); }