| commit | aff4c9463e590cc7ce60ad84d5b5f30a8114b4f6 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Fri Feb 12 22:46:51 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 12 22:46:51 2021 +0000 |
| tree | b9dee3558aba29f99becf1f92dddd1db57a11aa8 | |
| parent | 97792f96d7760311383ca9c94590d5039a025583 [diff] | |
| parent | c936e8ad0cb52f7bfc89e5544093e528de31c1c0 [diff] |
Merge "libbinder_ndk's addService ((warn_unused_result))" am: f7f4a9afb3 am: 6ea9614349 am: c936e8ad0c Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1579756 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icfa0f7f02b8489ba50f8d7c59ae1a2b28f00eb9d
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(); }