commit de6036dfb22a377fa2ad0ddc7007cd262729c7db
author Charles Chen <liangyuchen@google.com> Tue Mar 14 21:30:38 2023 +0000
committer Charles Chen <liangyuchen@google.com> Thu Mar 16 18:01:52 2023 +0000
tree c473ab6822e8cbffcfef557934e01bfdf3dfe095
parent 4e4d89343e428a834db7cc43268572daebfd0b04

API Feedback: rename AddServiceWithFlag with plurals

Make AServiceManager_addServiceWithFlags method plural since the
argument flags passed into the methods should be a bitmask which can
contain multiple options.

Bug: 272102518
Test: libbinder_ndk_unit_test
Change-Id: I0c31ef78f187be728e7c86c429a670b3a9081b36
Merged-In: I0c31ef78f187be728e7c86c429a670b3a9081b36

libs/binder/ndk/service_manager.cpp

diff --git a/libs/binder/ndk/service_manager.cpp b/libs/binder/ndk/service_manager.cpp
index 84da459..2977786 100644
--- a/libs/binder/ndk/service_manager.cpp
+++ b/libs/binder/ndk/service_manager.cpp
@@ -42,15 +42,15 @@
     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);
 }