diff options
| author | 2021-03-25 21:14:03 +0000 | |
|---|---|---|
| committer | 2021-03-25 21:14:03 +0000 | |
| commit | 8d4bb93e0eb807ff3ff5382784cd5bbfe1569bc7 (patch) | |
| tree | d8bf47d3111858a35e1942d8587b3e0c43d8b9e9 | |
| parent | 740b519aa6043b121e4cd187dfd27b7259d3d174 (diff) | |
| parent | 0be835e6700859e3e877a1973455d0d78885283d (diff) | |
Merge changes Icd00c776,I20414858 am: 3cb5663222 am: 0be835e670
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1649812
Change-Id: Ib1dc2f81e57492aa0fd784e9a0e333fa91e40e11
| -rw-r--r-- | libs/binder/ndk/include_ndk/android/binder_ibinder.h | 5 | ||||
| -rw-r--r-- | libs/binder/ndk/include_ndk/android/binder_status.h | 17 |
2 files changed, 16 insertions, 6 deletions
diff --git a/libs/binder/ndk/include_ndk/android/binder_ibinder.h b/libs/binder/ndk/include_ndk/android/binder_ibinder.h index a44c261b3b..8941e4996c 100644 --- a/libs/binder/ndk/include_ndk/android/binder_ibinder.h +++ b/libs/binder/ndk/include_ndk/android/binder_ibinder.h @@ -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 { /** diff --git a/libs/binder/ndk/include_ndk/android/binder_status.h b/libs/binder/ndk/include_ndk/android/binder_status.h index 05b25e7c40..b4dc08a49b 100644 --- a/libs/binder/ndk/include_ndk/android/binder_status.h +++ b/libs/binder/ndk/include_ndk/android/binder_status.h @@ -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. * |