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

waghpawan · android-build-merge-worker-robot · commit 732841e364f0 · 2024-10-10T20:35:54.000Z
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3287261 Change-Id: I47befaaf63ed5593171e539627a2319a92a59f2d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git 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);
         }

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,8 @@ AIBinder_Class* ICInterface::defineClass(const char* interfaceDescriptor,`
`299`	`299`
`300`	`300`	`#if defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__) \|\| __ANDROID_API__ >= 36`
`301`	`301`	`if API_LEVEL_AT_LEAST (36, 202504) {`
`302`		`- if (codeToFunction != nullptr) {`
	`302`	`+ if (codeToFunction != nullptr &&`
	`303`	`+ (&AIBinder_Class_setTransactionCodeToFunctionNameMap != nullptr)) {`
`303`	`304`	`AIBinder_Class_setTransactionCodeToFunctionNameMap(clazz, codeToFunction,`
`304`	`305`	`functionCount);`
`305`	`306`	`}`