| commit | f2e316ac20eb1791b517845147e8408a233a8ec0 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Tue Sep 28 17:28:54 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 28 17:28:54 2021 +0000 |
| tree | 9b9caa3ff5b8c6c7126dc2e6bf2cb3df3c4829da | |
| parent | ebe76514dbdd9a5edbf46e74be7745a8795e923b [diff] | |
| parent | 13ba6f3c3fef163b74f33092cdd3ed63c25e2bb3 [diff] |
Merge "libbinder: RPC avoid FdTrigger shutdown race" am: 13ba6f3c3f Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1838242 Change-Id: I5c31e71b6da92233a86e7dfaea89fddba4e119f7
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(); }