| commit | 6a80c8f654e4e42e671837617fc09202cea414c5 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Aug 23 04:19:17 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 23 04:19:17 2022 +0000 |
| tree | a4ae01def23562e235651e6369cd97988a971c8b | |
| parent | c1438662aafa75184c1d5809ef79fa0f9f401a96 [diff] | |
| parent | f00a433c4707d0cff31cafcb76fb178fecb52d66 [diff] |
Merge "libbinder: clear RpcSession::mStartedSetup in case of error" am: 8878fb5e5e am: f00a433c47 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2192108 Change-Id: I42dd15a73895c45a7a5c5d386b459368b7ce0cd2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/RpcSession.cpp b/libs/binder/RpcSession.cpp index d347262..8ddfa93 100644 --- a/libs/binder/RpcSession.cpp +++ b/libs/binder/RpcSession.cpp
@@ -484,6 +484,9 @@ 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;