diff options
| author | 2021-02-12 21:58:59 +0000 | |
|---|---|---|
| committer | 2021-02-12 21:58:59 +0000 | |
| commit | 6ea9614349d3a85565f62ad1bece76e68ca6eecd (patch) | |
| tree | e33ed3afb964ffa5d10f568d84ccfb08bd1f32d4 | |
| parent | 6acd539f0d979f4e7332bae0bc211736d12379e9 (diff) | |
| parent | f7f4a9afb307d89923da59344481d8a4b52dfd36 (diff) | |
Merge "libbinder_ndk's addService ((warn_unused_result))" am: f7f4a9afb3
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1579756
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0c2a33736f825aa6a17390cd6cddf0abaf34bb6e
| -rw-r--r-- | libs/binder/ndk/include_platform/android/binder_manager.h | 3 | ||||
| -rw-r--r-- | libs/binder/ndk/tests/binderVendorDoubleLoadTest.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libs/binder/ndk/include_platform/android/binder_manager.h b/libs/binder/ndk/include_platform/android/binder_manager.h index 2784aa823d..e13d4ccecd 100644 --- a/libs/binder/ndk/include_platform/android/binder_manager.h +++ b/libs/binder/ndk/include_platform/android/binder_manager.h @@ -31,7 +31,8 @@ __BEGIN_DECLS * * \return EX_NONE on success. */ -binder_exception_t AServiceManager_addService(AIBinder* binder, const char* instance); +__attribute__((warn_unused_result)) binder_exception_t AServiceManager_addService( + AIBinder* binder, const char* instance); /** * Gets a binder object with this specific instance name. Will return nullptr immediately if the diff --git a/libs/binder/ndk/tests/binderVendorDoubleLoadTest.cpp b/libs/binder/ndk/tests/binderVendorDoubleLoadTest.cpp index ad78e319a2..f3cd21822d 100644 --- a/libs/binder/ndk/tests/binderVendorDoubleLoadTest.cpp +++ b/libs/binder/ndk/tests/binderVendorDoubleLoadTest.cpp @@ -163,7 +163,8 @@ int main(int argc, char** argv) { // LOCAL SERVERS std::shared_ptr<NdkServer> ndkServer = SharedRefBase::make<NdkServer>(); - AServiceManager_addService(ndkServer->asBinder().get(), kLocalNdkServerName.c_str()); + CHECK(STATUS_OK == + AServiceManager_addService(ndkServer->asBinder().get(), kLocalNdkServerName.c_str())); return RUN_ALL_TESTS(); } |