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

Commit 714c6b8d authored by Pawan Wagh's avatar Pawan Wagh Committed by Automerger Merge Worker
Browse files

Merge "Add defineClass variant" into main am: 095fdbcf am: df7cb582 

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



Change-Id: Ie5a9caf7ed145a22a98ed7a0ee06e4350164fa13
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 41432e0f df7cb582

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

+9 −0
Original line number Original line Diff line number Diff line
@@ -178,6 +178,9 @@ class ICInterface : public SharedRefBase { 
                                              AIBinder_Class_onTransact onTransact,

                                              AIBinder_Class_onTransact onTransact,

                                              const char** codeToFunction, size_t functionCount);

                                              const char** codeToFunction, size_t functionCount);





    static inline AIBinder_Class* defineClass(const char* interfaceDescriptor,

                                              AIBinder_Class_onTransact onTransact);



   private:

   private:

    class ICInterfaceData {

    class ICInterfaceData {

       public:

       public:
@@ -266,6 +269,12 @@ std::shared_ptr<ICInterface> ICInterface::asInterface(AIBinder* binder) { 
    return ICInterfaceData::getInterface(binder);

    return ICInterfaceData::getInterface(binder);

}

}





AIBinder_Class* ICInterface::defineClass(const char* interfaceDescriptor,

                                         AIBinder_Class_onTransact onTransact) {



    return defineClass(interfaceDescriptor, onTransact, nullptr, 0);

}



AIBinder_Class* ICInterface::defineClass(const char* interfaceDescriptor,

AIBinder_Class* ICInterface::defineClass(const char* interfaceDescriptor,

                                         AIBinder_Class_onTransact onTransact,

                                         AIBinder_Class_onTransact onTransact,

                                         const char** codeToFunction, size_t functionCount) {

                                         const char** codeToFunction, size_t functionCount) {