commit 4811398ed12aff7cc9f0d3a78e44a6796a860d23
author Pawan Wagh <waghpawan@google.com> Thu Oct 10 20:02:34 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 10 20:02:34 2024 +0000
tree 98a114107089203cfdababdc268b6dc542fe16fc
parent 1456474eb432839806167248fbcf2c2283a0dda3
parent df6813406c0dd22dca002de7994ae0ee2e3f126b

Merge "Add check for valid AIBinder_Class_setTransactionCodeToFunctionNameMap" into main

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

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 9d68399..0ad110e 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 @@
 
 #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);
         }