| commit | c936e8ad0cb52f7bfc89e5544093e528de31c1c0 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Fri Feb 12 22:26:43 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 12 22:26:43 2021 +0000 |
| tree | 2c02c7b5898a720f6c4478c3b837e38df809c7fd | |
| parent | c599dff21f4758b74346e1581748692ef4b152d8 [diff] | |
| parent | 6ea9614349d3a85565f62ad1bece76e68ca6eecd [diff] |
Merge "libbinder_ndk's addService ((warn_unused_result))" am: f7f4a9afb3 am: 6ea9614349 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1579756 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I907800c31820696eea04ce20f0127a5421d6b52b
diff --git a/libs/binder/ndk/include_platform/android/binder_manager.h b/libs/binder/ndk/include_platform/android/binder_manager.h index 2784aa8..e13d4cc 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 @@ * * \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 ad78e31..f3cd218 100644 --- a/libs/binder/ndk/tests/binderVendorDoubleLoadTest.cpp +++ b/libs/binder/ndk/tests/binderVendorDoubleLoadTest.cpp
@@ -163,7 +163,8 @@ // 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(); }