diff options
| author | 2024-10-21 16:54:59 +0000 | |
|---|---|---|
| committer | 2024-10-21 16:54:59 +0000 | |
| commit | 21c78a301aeff0614c0ec5eadd744c33711e4bad (patch) | |
| tree | 7bd6d35abf40849ba819a21b0ce12d37b7cb7250 | |
| parent | 1ca24b1099f7cde26a480a043bfebc2c2ebb6b41 (diff) | |
| parent | a72b5858a085ae3b9433d9afd2d1a12e241be4aa (diff) | |
Merge "Document return values of ABinderRpc_Accessor_delegateAccessor" into main am: a72b5858a0
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3312669
Change-Id: Ie261d5825cbd30db26d72ed8af749e4e8fc9ff25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/binder/ndk/binder_rpc.cpp | 4 | ||||
| -rw-r--r-- | libs/binder/ndk/include_platform/android/binder_rpc.h | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libs/binder/ndk/binder_rpc.cpp b/libs/binder/ndk/binder_rpc.cpp index 07b8c40740..886eb4bdf8 100644 --- a/libs/binder/ndk/binder_rpc.cpp +++ b/libs/binder/ndk/binder_rpc.cpp @@ -255,7 +255,7 @@ ABinderRpc_Accessor* ABinderRpc_Accessor_new( "new variant was added to the ABinderRpc_ConnectionInfo and this needs to be " "updated."); } - return OK; + return STATUS_OK; }; sp<IBinder> accessorBinder = android::createAccessor(String16(instance), std::move(generate)); if (accessorBinder == nullptr) { @@ -321,7 +321,7 @@ binder_status_t ABinderRpc_Accessor_delegateAccessor(const char* instance, AIBin // This AIBinder needs a strong ref to pass ownership to the caller binder->incStrong(nullptr); *outDelegator = binder.get(); - return OK; + return STATUS_OK; } ABinderRpc_ConnectionInfo* ABinderRpc_ConnectionInfo_new(const sockaddr* addr, socklen_t len) { diff --git a/libs/binder/ndk/include_platform/android/binder_rpc.h b/libs/binder/ndk/include_platform/android/binder_rpc.h index 9fe5d788b4..66667d33bd 100644 --- a/libs/binder/ndk/include_platform/android/binder_rpc.h +++ b/libs/binder/ndk/include_platform/android/binder_rpc.h @@ -287,6 +287,11 @@ ABinderRpc_Accessor* _Nullable ABinderRpc_Accessor_fromBinder(const char* _Nonnu * this object with one strong ref count and is responsible for removing * that ref count with with AIBinder_decStrong when the caller wishes to * drop the reference. + * \return STATUS_OK on success. + * STATUS_UNEXPECTED_NULL if instance or binder arguments are null. + * STATUS_BAD_TYPE if the binder is not an IAccessor. + * STATUS_NAME_NOT_FOUND if the binder is an IAccessor, but not + * associated with the provided instance name. */ binder_status_t ABinderRpc_Accessor_delegateAccessor(const char* _Nonnull instance, AIBinder* _Nonnull binder, |