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

Commit 3cb56632 authored by Steven Moreland's avatar Steven Moreland Committed by Gerrit Code Review
Browse files

Merge changes Icd00c776,I20414858 

* changes:
  libbinder_ndk: mv host tip to binder_status.h
  libbinder_ndk: document preferred error types
parents e744802b 7fdee829

libs/binder/ndk/include_ndk/android/binder_ibinder.h

+0 −5
Original line number Diff line number Diff line
@@ -36,11 +36,6 @@ 


__BEGIN_DECLS



#ifndef __ANDROID_API__

#error Android builds must be compiled against a specific API. If this is an \

 android platform host build, you must use libbinder_ndk_host_user.

#endif



typedef uint32_t binder_flags_t;

enum {

    /**

libs/binder/ndk/include_ndk/android/binder_status.h

+16 −1
Original line number Diff line number Diff line
@@ -32,6 +32,16 @@ 


__BEGIN_DECLS



#ifndef __ANDROID_API__

#error Android builds must be compiled against a specific API. If this is an \

 android platform host build, you must use libbinder_ndk_host_user.

#endif



/**

 * Low-level status types for use in binder. This is the least preferable way to

 * return an error for binder services (where binder_exception_t should be used,

 * particularly EX_SERVICE_SPECIFIC).

 */

enum {

    STATUS_OK = 0,
@@ -62,6 +72,10 @@ enum { 
 */

typedef int32_t binder_status_t;



/**

 * Top level exceptions types for Android binder errors, mapping to Java

 * exceptions. Also see Parcel.java.

 */

enum {

    EX_NONE = 0,

    EX_SECURITY = -1,
@@ -170,7 +184,8 @@ __attribute__((warn_unused_result)) AStatus* AStatus_fromServiceSpecificErrorWit 
/**

 * New status with binder_status_t. This is typically for low level failures when a binder_status_t

 * is returned by an API on AIBinder or AParcel, and that is to be returned from a method returning

 * an AStatus instance.

 * an AStatus instance. This is the least preferable way to return errors.

 * Prefer exceptions (particularly service-specific errors) when possible.

 *

 * Available since API level 29.

 *