diff options
| author | 2020-02-19 03:55:38 +0000 | |
|---|---|---|
| committer | 2020-02-19 03:55:38 +0000 | |
| commit | 377164acceddc5e9a039ac4911ad31a7ec9020b8 (patch) | |
| tree | 8e1eaa9f2d4ec7baa030b799ea14683b12c9918a | |
| parent | c6f093abedd6f9688a35b14be7a3ab46046bc1bd (diff) | |
| parent | 4cbbed127f44697cbea04da07931ca0d9c1a0916 (diff) | |
Merge "mark AIBinder_Class_setHandleShellCommand as weak."
| -rw-r--r-- | libs/binder/ndk/include_ndk/android/binder_interface_utils.h | 4 | ||||
| -rw-r--r-- | libs/binder/ndk/include_platform/android/binder_shell.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libs/binder/ndk/include_ndk/android/binder_interface_utils.h b/libs/binder/ndk/include_ndk/android/binder_interface_utils.h index e6b743ba3c..33e4586137 100644 --- a/libs/binder/ndk/include_ndk/android/binder_interface_utils.h +++ b/libs/binder/ndk/include_ndk/android/binder_interface_utils.h @@ -238,7 +238,9 @@ AIBinder_Class* ICInterface::defineClass(const char* interfaceDescriptor, // ourselves. The defaults are harmless. AIBinder_Class_setOnDump(clazz, ICInterfaceData::onDump); #ifdef HAS_BINDER_SHELL_COMMAND - AIBinder_Class_setHandleShellCommand(clazz, ICInterfaceData::handleShellCommand); + if (AIBinder_Class_setHandleShellCommand != nullptr) { + AIBinder_Class_setHandleShellCommand(clazz, ICInterfaceData::handleShellCommand); + } #endif return clazz; } diff --git a/libs/binder/ndk/include_platform/android/binder_shell.h b/libs/binder/ndk/include_platform/android/binder_shell.h index 17b38b0dae..07d89e67fc 100644 --- a/libs/binder/ndk/include_platform/android/binder_shell.h +++ b/libs/binder/ndk/include_platform/android/binder_shell.h @@ -48,8 +48,7 @@ typedef binder_status_t (*AIBinder_handleShellCommand)(AIBinder* binder, int in, * \param handleShellCommand function to call when a shell transaction is * received */ -void AIBinder_Class_setHandleShellCommand(AIBinder_Class* clazz, - AIBinder_handleShellCommand handleShellCommand) - __INTRODUCED_IN(30); +__attribute__((weak)) void AIBinder_Class_setHandleShellCommand( + AIBinder_Class* clazz, AIBinder_handleShellCommand handleShellCommand) __INTRODUCED_IN(30); __END_DECLS |