Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aff4c946 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder_ndk's addService ((warn_unused_result))" am: f7f4a9af am:... 

Merge "libbinder_ndk's addService ((warn_unused_result))" am: f7f4a9af am: 6ea96143 am: c936e8ad

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1579756

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfa0f7f02b8489ba50f8d7c59ae1a2b28f00eb9d
parents 97792f96 c936e8ad

libs/binder/ndk/include_platform/android/binder_manager.h

+2 −1
Original line number Diff line number Diff line
@@ -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

libs/binder/ndk/tests/binderVendorDoubleLoadTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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();

}