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

Commit bcc98984 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder_ndk: cpp asBinder/isRemote final" am: 4a483fa8 am: df4e1556 am: e51a4c0f 

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

Change-Id: I0fe2b29d2971d664b09c446b586e3dafafa9ef36
parents ebbc6b94 e51a4c0f

libs/binder/ndk/include_cpp/android/binder_interface_utils.h

+4 −4
Original line number Diff line number Diff line
@@ -190,9 +190,9 @@ class BnCInterface : public INTERFACE { 
    BnCInterface() {}

    virtual ~BnCInterface() {}



    SpAIBinder asBinder() override;

    SpAIBinder asBinder() override final;



    bool isRemote() override { return false; }

    bool isRemote() override final { return false; }



   protected:

    /**
@@ -215,9 +215,9 @@ class BpCInterface : public INTERFACE { 
    explicit BpCInterface(const SpAIBinder& binder) : mBinder(binder) {}

    virtual ~BpCInterface() {}



    SpAIBinder asBinder() override;

    SpAIBinder asBinder() override final;



    bool isRemote() override { return AIBinder_isRemote(mBinder.get()); }

    bool isRemote() override final { return AIBinder_isRemote(mBinder.get()); }



    binder_status_t dump(int fd, const char** args, uint32_t numArgs) override {

        return AIBinder_dump(asBinder().get(), fd, args, numArgs);