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

Commit d2f8c638 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "libbinder_ndk: make AIBinder_isRemote const." am: a93e875c am: 49a71874 

am: ac567d0b

Change-Id: Ib97ac9706a2fb53f30aa94d4c5c3e6f585553532
parents 8ccb5b72 ac567d0b

libs/binder/ndk/AIBinder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ AIBinder* AIBinder_new(const AIBinder_Class* clazz, void* args) { 
    return ret.get();

}



bool AIBinder_isRemote(AIBinder* binder) {

bool AIBinder_isRemote(const AIBinder* binder) {

    if (binder == nullptr) {

        return true;

    }

libs/binder/ndk/AIBinder_internal.h

+4 −1
Original line number Diff line number Diff line
@@ -42,7 +42,10 @@ struct AIBinder : public virtual ::android::RefBase { 
    virtual ABBinder* asABBinder() { return nullptr; }

    virtual ABpBinder* asABpBinder() { return nullptr; }



    bool isRemote() { return getBinder()->remoteBinder() != nullptr; }

    bool isRemote() const {

        ::android::sp<::android::IBinder> binder = const_cast<AIBinder*>(this)->getBinder();

        return binder->remoteBinder() != nullptr;

    }



private:

    // AIBinder instance is instance of this class for a local object. In order to transact on a

libs/binder/ndk/include_ndk/android/binder_ibinder.h

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ __attribute__((warn_unused_result)) AIBinder* AIBinder_new(const AIBinder_Class* 
/**

 * If this is hosted in a process other than the current one.

 */

bool AIBinder_isRemote(AIBinder* binder);

bool AIBinder_isRemote(const AIBinder* binder);



/**

 * This can only be called if a strong reference to this object already exists in process.