diff options
| -rw-r--r-- | libs/binder/ndk/include_platform/android/binder_manager.h | 6 | ||||
| -rw-r--r-- | libs/binder/ndk/libbinder_ndk.map.txt | 2 | ||||
| -rw-r--r-- | libs/binder/ndk/service_manager.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/libs/binder/ndk/include_platform/android/binder_manager.h b/libs/binder/ndk/include_platform/android/binder_manager.h index 43159d8ba2..89fd7a38c1 100644 --- a/libs/binder/ndk/include_platform/android/binder_manager.h +++ b/libs/binder/ndk/include_platform/android/binder_manager.h @@ -56,12 +56,12 @@ __attribute__((warn_unused_result)) binder_exception_t AServiceManager_addServic * * \param binder object to register globally with the service manager. * \param instance identifier of the service. This will be used to lookup the service. - * \param flag an AServiceManager_AddServiceFlag enum to denote how the service should be added. + * \param flags an AServiceManager_AddServiceFlag enum to denote how the service should be added. * * \return EX_NONE on success. */ -__attribute__((warn_unused_result)) binder_exception_t AServiceManager_addServiceWithFlag( - AIBinder* binder, const char* instance, const AServiceManager_AddServiceFlag flag) +__attribute__((warn_unused_result)) binder_exception_t AServiceManager_addServiceWithFlags( + AIBinder* binder, const char* instance, const AServiceManager_AddServiceFlag flags) __INTRODUCED_IN(34); /** diff --git a/libs/binder/ndk/libbinder_ndk.map.txt b/libs/binder/ndk/libbinder_ndk.map.txt index 1078fb2b16..1c5f79f791 100644 --- a/libs/binder/ndk/libbinder_ndk.map.txt +++ b/libs/binder/ndk/libbinder_ndk.map.txt @@ -158,7 +158,7 @@ LIBBINDER_NDK34 { # introduced=UpsideDownCake AServiceManager_getUpdatableApexName; # systemapi AServiceManager_registerForServiceNotifications; # systemapi llndk AServiceManager_NotificationRegistration_delete; # systemapi llndk - AServiceManager_addServiceWithFlag; # systemapi llndk + AServiceManager_addServiceWithFlags; # systemapi llndk }; LIBBINDER_NDK_PLATFORM { diff --git a/libs/binder/ndk/service_manager.cpp b/libs/binder/ndk/service_manager.cpp index 84da459454..29777866e2 100644 --- a/libs/binder/ndk/service_manager.cpp +++ b/libs/binder/ndk/service_manager.cpp @@ -42,15 +42,15 @@ binder_exception_t AServiceManager_addService(AIBinder* binder, const char* inst return PruneException(exception); } -binder_exception_t AServiceManager_addServiceWithFlag(AIBinder* binder, const char* instance, - const AServiceManager_AddServiceFlag flag) { +binder_exception_t AServiceManager_addServiceWithFlags(AIBinder* binder, const char* instance, + const AServiceManager_AddServiceFlag flags) { if (binder == nullptr || instance == nullptr) { return EX_ILLEGAL_ARGUMENT; } sp<IServiceManager> sm = defaultServiceManager(); - bool allowIsolated = flag & AServiceManager_AddServiceFlag::ADD_SERVICE_ALLOW_ISOLATED; + bool allowIsolated = flags & AServiceManager_AddServiceFlag::ADD_SERVICE_ALLOW_ISOLATED; status_t exception = sm->addService(String16(instance), binder->getBinder(), allowIsolated); return PruneException(exception); } |