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

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

Merge "Document return values of ABinderRpc_Accessor_delegateAccessor" into... 

Merge "Document return values of ABinderRpc_Accessor_delegateAccessor" into main am: a72b5858 am: 21c78a30

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



Change-Id: If5652e8d0a322e8e792247e04310dbfc6cb64b59
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 048a1814 21c78a30

libs/binder/ndk/binder_rpc.cpp

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

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

+5 −0
Original line number Diff line number Diff line
@@ -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,