summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2022-08-23 03:46:41 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-23 03:46:41 +0000
commitf00a433c4707d0cff31cafcb76fb178fecb52d66 (patch)
treea4ae01def23562e235651e6369cd97988a971c8b
parent9132781781cca7a0e78f99e078ab543c74d0d76a (diff)
parent8878fb5e5e2b65fe1e9a2bc536ab5e19917bb270 (diff)
Merge "libbinder: clear RpcSession::mStartedSetup in case of error" am: 8878fb5e5e
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2192108 Change-Id: If75217390dd81110abe9a89ec5b5c0c1b075d781 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--libs/binder/RpcSession.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/binder/RpcSession.cpp b/libs/binder/RpcSession.cpp
index d347262040..8ddfa93c00 100644
--- a/libs/binder/RpcSession.cpp
+++ b/libs/binder/RpcSession.cpp
@@ -484,6 +484,9 @@ status_t RpcSession::setupClient(const std::function<status_t(const std::vector<
mProtocolVersion = oldProtocolVersion;
mConnections = {};
+
+ // clear mStartedSetup so that we can reuse this RpcSession
+ mStartedSetup = false;
});
if (status_t status = connectAndInit({}, false /*incoming*/); status != OK) return status;