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

Commit 35fbd0a9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove onAsBinder() override for BackendUnifiedServiceManager" into main

parents 382fc4d2 bee6be16

libs/binder/BackendUnifiedServiceManager.h

+0 −2
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ public: 
        return mTheRealServiceManager->getInterfaceDescriptor();

    }



    IBinder* onAsBinder() override { return IInterface::asBinder(mTheRealServiceManager).get(); }



private:

    sp<os::IServiceManager> mTheRealServiceManager;

    void toBinderService(const os::Service& in, os::Service* _out);

libs/binder/tests/binderRpcUniversalTests.cpp

+2 −1
Original line number Diff line number Diff line
@@ -301,7 +301,8 @@ TEST_P(BinderRpc, CannotSendRegularBinderOverSocketBinder) { 


    auto proc = createRpcTestSocketServerProcess({});



    sp<IBinder> someRealBinder = IInterface::asBinder(defaultServiceManager());

    sp<IBinder> someRealBinder = defaultServiceManager()->getService(String16("activity"));

    ASSERT_NE(someRealBinder, nullptr);

    sp<IBinder> outBinder;

    EXPECT_EQ(INVALID_OPERATION,

              proc.rootIface->repeatBinder(someRealBinder, &outBinder).transactionError());