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

Commit ad82fe81 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder_ndk: mark 29 API on old plat funcs" am: 95f88e71 am:... 

Merge "libbinder_ndk: mark 29 API on old plat funcs" am: 95f88e71 am: f7ec7860 am: 06b107fb am: 500651b2

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

Change-Id: I7e61f1ba020f1a502ae4e60d964f0b0b9cf63395
parents d3e046a3 500651b2

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

+5 −3
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ __BEGIN_DECLS 
 * \return EX_NONE on success.

 * \return EX_NONE on success.

 */

 */

__attribute__((warn_unused_result)) binder_exception_t AServiceManager_addService(

__attribute__((warn_unused_result)) binder_exception_t AServiceManager_addService(

        AIBinder* binder, const char* instance);

        AIBinder* binder, const char* instance) __INTRODUCED_IN(29);





/**

/**

 * Gets a binder object with this specific instance name. Will return nullptr immediately if the

 * Gets a binder object with this specific instance name. Will return nullptr immediately if the
@@ -47,7 +47,8 @@ __attribute__((warn_unused_result)) binder_exception_t AServiceManager_addServic 
 *

 *

 * \param instance identifier of the service used to lookup the service.

 * \param instance identifier of the service used to lookup the service.

 */

 */

__attribute__((warn_unused_result)) AIBinder* AServiceManager_checkService(const char* instance);

__attribute__((warn_unused_result)) AIBinder* AServiceManager_checkService(const char* instance)

        __INTRODUCED_IN(29);





/**

/**

 * Gets a binder object with this specific instance name. Blocks for a couple of seconds waiting on

 * Gets a binder object with this specific instance name. Blocks for a couple of seconds waiting on
@@ -59,7 +60,8 @@ __attribute__((warn_unused_result)) AIBinder* AServiceManager_checkService(const 
 *

 *

 * \param instance identifier of the service used to lookup the service.

 * \param instance identifier of the service used to lookup the service.

 */

 */

__attribute__((warn_unused_result)) AIBinder* AServiceManager_getService(const char* instance);

__attribute__((warn_unused_result)) AIBinder* AServiceManager_getService(const char* instance)

        __INTRODUCED_IN(29);





/**

/**

 * Registers a lazy service with the default service manager under the 'instance' name.

 * Registers a lazy service with the default service manager under the 'instance' name.