Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 948dfc53 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder: clear RpcSession::mStartedSetup in case of error" am:... 

Merge "libbinder: clear RpcSession::mStartedSetup in case of error" am: 8878fb5e am: f00a433c am: 6a80c8f6

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2192108



Change-Id: Icf5ff7280f4977eac204fb151c48e594c839bc7b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 29d6ddfc 6a80c8f6

libs/binder/RpcSession.cpp

+3 −0
Original line number Diff line number Diff line
@@ -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;