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

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

Merge "Add check for valid AIBinder_Class_setTransactionCodeToFunctionNameMap"... 

Merge "Add check for valid AIBinder_Class_setTransactionCodeToFunctionNameMap" into main am: 4811398e am: 732841e3

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



Change-Id: I2a8844af5f497204967fe421ab3f186023b8db4e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ca04fcfb 732841e3

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

+2 −1
Original line number Diff line number Diff line
@@ -299,7 +299,8 @@ AIBinder_Class* ICInterface::defineClass(const char* interfaceDescriptor, 


#if defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__) || __ANDROID_API__ >= 36

    if API_LEVEL_AT_LEAST (36, 202504) {

        if (codeToFunction != nullptr) {

        if (codeToFunction != nullptr &&

            (&AIBinder_Class_setTransactionCodeToFunctionNameMap != nullptr)) {

            AIBinder_Class_setTransactionCodeToFunctionNameMap(clazz, codeToFunction,

                                                               functionCount);

        }