| commit | 4a0fad36e12b5ad97b4420df39528fb41fd278eb | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu May 20 19:51:59 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 20 19:51:59 2021 +0000 |
| tree | 95f19732ad9e56807331585b5e5f8e1421147205 | |
| parent | 92ce72120a4c8192caa6ea0b467b0c5cbbbda1d3 [diff] | |
| parent | de10257e6a761eaa842967f88fa72a0fc84bcf24 [diff] |
Merge "~RpcServer() calls shutdown explicitly." am: de10257e6a Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1712596 Change-Id: I3efaf6a14812e538b52a2cca719d4795f2439364
diff --git a/libs/binder/RpcServer.cpp b/libs/binder/RpcServer.cpp index e31aea0..63d4dde 100644 --- a/libs/binder/RpcServer.cpp +++ b/libs/binder/RpcServer.cpp
@@ -39,7 +39,9 @@ using base::unique_fd; RpcServer::RpcServer() {} -RpcServer::~RpcServer() {} +RpcServer::~RpcServer() { + (void)shutdown(); +} sp<RpcServer> RpcServer::make() { return sp<RpcServer>::make(); @@ -204,7 +206,6 @@ } bool RpcServer::shutdown() { - LOG_ALWAYS_FATAL_IF(!mAgreedExperimental, "no!"); std::unique_lock<std::mutex> _l(mLock); if (mShutdownTrigger == nullptr) return false;