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

Commit e05a2b35 authored by Devin Moore's avatar Devin Moore
Browse files

Add more const to 'instances' in registerAccessorProvider 

The chars, the pointer to the chars, and the pointer to the pointers
should all be constant.

Test: m
Bug: 358427181
Change-Id: I0a54be61962cc1c445748e94f32ff583c88b162c
parent b7c7d8ad

libs/binder/ndk/binder_rpc.cpp

+2 −2
Original line number Diff line number Diff line
@@ -104,8 +104,8 @@ struct OnDeleteProviderHolder { 
};



ABinderRpc_AccessorProvider* ABinderRpc_registerAccessorProvider(

        ABinderRpc_AccessorProvider_getAccessorCallback provider, const char** instances,

        size_t numInstances, void* data,

        ABinderRpc_AccessorProvider_getAccessorCallback provider,

        const char* const* const instances, size_t numInstances, void* data,

        ABinderRpc_AccessorProviderUserData_deleteCallback onDelete) {

    if (provider == nullptr) {

        ALOGE("Null provider passed to ABinderRpc_registerAccessorProvider");

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

+3 −2
Original line number Diff line number Diff line
@@ -144,8 +144,9 @@ typedef void (*ABinderRpc_AccessorProviderUserData_deleteCallback)(void* _Nullab 
 */

ABinderRpc_AccessorProvider* _Nullable ABinderRpc_registerAccessorProvider(

        ABinderRpc_AccessorProvider_getAccessorCallback _Nonnull provider,

        const char* _Nullable* _Nonnull instances, size_t numInstances, void* _Nullable data,

        ABinderRpc_AccessorProviderUserData_deleteCallback _Nullable onDelete) __INTRODUCED_IN(36);

        const char* _Nullable const* const _Nonnull instances, size_t numInstances,

        void* _Nullable data, ABinderRpc_AccessorProviderUserData_deleteCallback _Nullable onDelete)

        __INTRODUCED_IN(36);



/**

 * Remove an ABinderRpc_AccessorProvider from libbinder. This will remove references