Skip to content

Commit e05a2b3

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
1 parent b7c7d8a commit e05a2b3

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

libs/binder/ndk/binder_rpc.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ struct OnDeleteProviderHolder {
104104
};
105105

106106
ABinderRpc_AccessorProvider* ABinderRpc_registerAccessorProvider(
107-
ABinderRpc_AccessorProvider_getAccessorCallback provider, const char** instances,
108-
size_t numInstances, void* data,
107+
ABinderRpc_AccessorProvider_getAccessorCallback provider,
108+
const char* const* const instances, size_t numInstances, void* data,
109109
ABinderRpc_AccessorProviderUserData_deleteCallback onDelete) {
110110
if (provider == nullptr) {
111111
ALOGE("Null provider passed to ABinderRpc_registerAccessorProvider");

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,9 @@ typedef void (*ABinderRpc_AccessorProviderUserData_deleteCallback)(void* _Nullab
144144
*/
145145
ABinderRpc_AccessorProvider* _Nullable ABinderRpc_registerAccessorProvider(
146146
ABinderRpc_AccessorProvider_getAccessorCallback _Nonnull provider,
147-
const char* _Nullable* _Nonnull instances, size_t numInstances, void* _Nullable data,
148-
ABinderRpc_AccessorProviderUserData_deleteCallback _Nullable onDelete) __INTRODUCED_IN(36);
147+
const char* _Nullable const* const _Nonnull instances, size_t numInstances,
148+
void* _Nullable data, ABinderRpc_AccessorProviderUserData_deleteCallback _Nullable onDelete)
149+
__INTRODUCED_IN(36);
149150

150151
/**
151152
* Remove an ABinderRpc_AccessorProvider from libbinder. This will remove references

0 commit comments

Comments
 (0)