diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/binder/ndk/Android.bp | 2 | ||||
| -rw-r--r-- | libs/binder/ndk/include_ndk/android/binder_parcel.h | 2 | ||||
| -rw-r--r-- | libs/binder/ndk/include_ndk/android/binder_parcel_utils.h | 4 | ||||
| -rw-r--r-- | libs/binder/ndk/parcel.cpp | 14 |
4 files changed, 12 insertions, 10 deletions
diff --git a/libs/binder/ndk/Android.bp b/libs/binder/ndk/Android.bp index dc4e000766..1b69dfd6a7 100644 --- a/libs/binder/ndk/Android.bp +++ b/libs/binder/ndk/Android.bp @@ -23,6 +23,8 @@ cc_library { "include_apex", ], + cflags: ["-Wall", "-Wextra", "-Werror"], + srcs: [ "ibinder.cpp", "ibinder_jni.cpp", diff --git a/libs/binder/ndk/include_ndk/android/binder_parcel.h b/libs/binder/ndk/include_ndk/android/binder_parcel.h index 7296d87588..2258210f2e 100644 --- a/libs/binder/ndk/include_ndk/android/binder_parcel.h +++ b/libs/binder/ndk/include_ndk/android/binder_parcel.h @@ -149,7 +149,7 @@ typedef bool (*AParcel_stringArrayElementAllocator)(void* arrayData, size_t inde * not required to be null-terminated. If the object at index is null, then this should be null. */ typedef const char* (*AParcel_stringArrayElementGetter)(const void* arrayData, size_t index, - size_t* outLength); + int32_t* outLength); /** * This is called to allocate an array of size 'length'. If length is -1, then a 'null' array (or diff --git a/libs/binder/ndk/include_ndk/android/binder_parcel_utils.h b/libs/binder/ndk/include_ndk/android/binder_parcel_utils.h index 53d6e9566a..fcdf7af22c 100644 --- a/libs/binder/ndk/include_ndk/android/binder_parcel_utils.h +++ b/libs/binder/ndk/include_ndk/android/binder_parcel_utils.h @@ -299,7 +299,7 @@ static inline bool AParcel_stdVectorStringElementAllocator(void* vectorData, siz * index. */ static inline const char* AParcel_stdVectorStringElementGetter(const void* vectorData, size_t index, - size_t* outLength) { + int32_t* outLength) { const std::vector<std::string>* vec = static_cast<const std::vector<std::string>*>(vectorData); const std::string& element = vec->at(index); @@ -327,7 +327,7 @@ static inline bool AParcel_nullableStdVectorStringElementAllocator(void* vectorD */ static inline const char* AParcel_nullableStdVectorStringElementGetter(const void* vectorData, size_t index, - size_t* outLength) { + int32_t* outLength) { const std::optional<std::vector<std::optional<std::string>>>* vec = static_cast<const std::optional<std::vector<std::optional<std::string>>>*>(vectorData); const std::optional<std::string>& element = vec->value().at(index); diff --git a/libs/binder/ndk/parcel.cpp b/libs/binder/ndk/parcel.cpp index 39768557d4..ae2276e794 100644 --- a/libs/binder/ndk/parcel.cpp +++ b/libs/binder/ndk/parcel.cpp @@ -173,7 +173,7 @@ binder_status_t WriteArray(AParcel* parcel, const void* arrayData, int32_t lengt Parcel* rawParcel = parcel->get(); - for (size_t i = 0; i < length; i++) { + for (int32_t i = 0; i < length; i++) { status = (rawParcel->*write)(getter(arrayData, i)); if (status != STATUS_OK) return PruneStatusT(status); @@ -197,7 +197,7 @@ binder_status_t ReadArray(const AParcel* parcel, void* arrayData, ArrayAllocator if (length <= 0) return STATUS_OK; - for (size_t i = 0; i < length; i++) { + for (int32_t i = 0; i < length; i++) { T readTarget; status = (rawParcel->*read)(&readTarget); if (status != STATUS_OK) return PruneStatusT(status); @@ -376,8 +376,8 @@ binder_status_t AParcel_writeStringArray(AParcel* parcel, const void* arrayData, if (status != STATUS_OK) return status; if (length <= 0) return STATUS_OK; - for (size_t i = 0; i < length; i++) { - size_t elementLength = 0; + for (int32_t i = 0; i < length; i++) { + int32_t elementLength = 0; const char* str = getter(arrayData, i, &elementLength); if (str == nullptr && elementLength != -1) return STATUS_BAD_VALUE; @@ -392,7 +392,7 @@ binder_status_t AParcel_writeStringArray(AParcel* parcel, const void* arrayData, // allocator. struct StringArrayElementAllocationAdapter { void* arrayData; // stringData from the NDK - size_t index; // index into the string array + int32_t index; // index into the string array AParcel_stringArrayElementAllocator elementAllocator; static bool Allocator(void* stringData, int32_t length, char** buffer) { @@ -441,7 +441,7 @@ binder_status_t AParcel_writeParcelableArray(AParcel* parcel, const void* arrayD if (status != STATUS_OK) return status; if (length <= 0) return STATUS_OK; - for (size_t i = 0; i < length; i++) { + for (int32_t i = 0; i < length; i++) { binder_status_t status = elementWriter(parcel, arrayData, i); if (status != STATUS_OK) return status; } @@ -464,7 +464,7 @@ binder_status_t AParcel_readParcelableArray(const AParcel* parcel, void* arrayDa if (length == -1) return STATUS_OK; // null array - for (size_t i = 0; i < length; i++) { + for (int32_t i = 0; i < length; i++) { binder_status_t status = elementReader(parcel, arrayData, i); if (status != STATUS_OK) return status; } |