diff options
| author | 2024-10-10 20:53:12 +0000 | |
|---|---|---|
| committer | 2024-10-10 20:53:12 +0000 | |
| commit | fbf5a5bd50458e284a141867d344938ee7f5b40c (patch) | |
| tree | 5f9886c8a069447811be4b7752de4b78a96dbbdd | |
| parent | ca04fcfbd23b6324778f66ea4481a146b69391f2 (diff) | |
| parent | 732841e364f06629ffe0274e9b056d700c250b6c (diff) | |
Merge "Add check for valid AIBinder_Class_setTransactionCodeToFunctionNameMap" into main am: 4811398ed1 am: 732841e364
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3287261
Change-Id: I2a8844af5f497204967fe421ab3f186023b8db4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/binder/ndk/include_cpp/android/binder_interface_utils.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/binder/ndk/include_cpp/android/binder_interface_utils.h b/libs/binder/ndk/include_cpp/android/binder_interface_utils.h index 9d68399145..0ad110ee83 100644 --- a/libs/binder/ndk/include_cpp/android/binder_interface_utils.h +++ b/libs/binder/ndk/include_cpp/android/binder_interface_utils.h @@ -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); } |