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

Commit dd1d128f authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "Binder tests: add explicit constructor to initialize ProcessSession"... 

Merge "Binder tests: add explicit constructor to initialize ProcessSession" am: 8e9174b7 am: 1f052f59 am: ce5956b1 am: 5050e876 am: c1301cc9 am: 639fe997

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



Change-Id: I5f9a8ca736769b8bdb38669cf96101d8f591c86d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4003b161 639fe997

libs/binder/tests/binderRpcTestFixture.h

+2 −3
Original line number Original line Diff line number Diff line
@@ -79,6 +79,7 @@ struct BinderRpcTestProcessSession { 
        expectAlreadyShutdown = true;

        expectAlreadyShutdown = true;

    }

    }





    BinderRpcTestProcessSession(std::unique_ptr<ProcessSession> proc) : proc(std::move(proc)){};

    BinderRpcTestProcessSession(BinderRpcTestProcessSession&&) = default;

    BinderRpcTestProcessSession(BinderRpcTestProcessSession&&) = default;

    ~BinderRpcTestProcessSession() {

    ~BinderRpcTestProcessSession() {

        if (!expectAlreadyShutdown) {

        if (!expectAlreadyShutdown) {
@@ -138,9 +139,7 @@ public: 
    }

    }





    BinderRpcTestProcessSession createRpcTestSocketServerProcess(const BinderRpcOptions& options) {

    BinderRpcTestProcessSession createRpcTestSocketServerProcess(const BinderRpcOptions& options) {

        BinderRpcTestProcessSession ret{

        BinderRpcTestProcessSession ret(createRpcTestSocketServerProcessEtc(options));

                .proc = createRpcTestSocketServerProcessEtc(options),

        };





        ret.rootBinder = ret.proc->sessions.empty() ? nullptr : ret.proc->sessions.at(0).root;

        ret.rootBinder = ret.proc->sessions.empty() ? nullptr : ret.proc->sessions.at(0).root;

        ret.rootIface = interface_cast<IBinderRpcTest>(ret.rootBinder);

        ret.rootIface = interface_cast<IBinderRpcTest>(ret.rootBinder);