Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use new read(Embedded)Buffer APIs." am: 34ed84d4eb

Browse Source 
am: aa4d6f1be9

Change-Id: I5153b688467f4d06da701eaa34bfa19c7904e33d
This commit is contained in:
Martijn Coenen
2017-01-12 10:31:35 +00:00
committed by android-build-merger
parent 272e70bf69 aa4d6f1be9
commit eed50c1809
1 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
core/jni/android_os_HwParcel.cpp
View File

@@ -568,15 +568,16 @@ static jstring JHwParcel_native_readString(JNIEnv *env, jobject thiz) {
size_t parentHandle; size_t parentHandle;
const hidl_string *s = static_cast<const hidl_string *>( const hidl_string *s;
parcel->readBuffer(&parentHandle)); status_t err = parcel->readBuffer(&parentHandle,
reinterpret_cast<const void**>(&s));
if (s == NULL) { if (err != OK) {
signalExceptionForError(env, UNKNOWN_ERROR); signalExceptionForError(env, err);
return NULL; return NULL;
} }
status_t err = ::android::hardware::readEmbeddedFromParcel( err = ::android::hardware::readEmbeddedFromParcel(
const_cast<hidl_string *>(s), const_cast<hidl_string *>(s),
*parcel, parentHandle, 0 /* parentOffset */); *parcel, parentHandle, 0 /* parentOffset */);
@@ -593,20 +594,20 @@ static Type ## Array JHwParcel_native_read ## Suffix ## Vector( \
JNIEnv *env, jobject thiz) { \ JNIEnv *env, jobject thiz) { \
hardware::Parcel *parcel = \ hardware::Parcel *parcel = \
JHwParcel::GetNativeContext(env, thiz)->getParcel(); \ JHwParcel::GetNativeContext(env, thiz)->getParcel(); \
\
size_t parentHandle; \ size_t parentHandle; \
\ \
const hidl_vec<Type> *vec = \ const hidl_vec<Type> *vec; \
(const hidl_vec<Type> *)parcel->readBuffer(&parentHandle); \ status_t err = parcel->readBuffer(&parentHandle, \
reinterpret_cast<const void**>(&vec)); \
\ \
if (vec == NULL) { \ if (err != OK) { \
signalExceptionForError(env, UNKNOWN_ERROR); \ signalExceptionForError(env, err); \
return NULL; \ return NULL; \
} \ } \
\ \
size_t childHandle; \ size_t childHandle; \
\ \
status_t err = ::android::hardware::readEmbeddedFromParcel( \ err = ::android::hardware::readEmbeddedFromParcel( \
const_cast<hidl_vec<Type> *>(vec), \ const_cast<hidl_vec<Type> *>(vec), \
*parcel, \ *parcel, \
parentHandle, \ parentHandle, \
@@ -638,17 +639,18 @@ static jbooleanArray JHwParcel_native_readBoolVector(
size_t parentHandle; size_t parentHandle;
const hidl_vec<bool> *vec = const hidl_vec<bool> *vec;
(const hidl_vec<bool> *)parcel->readBuffer(&parentHandle); status_t err = parcel->readBuffer(&parentHandle,
reinterpret_cast<const void**>(&vec));
if (vec == NULL) { if (err != OK) {
signalExceptionForError(env, UNKNOWN_ERROR); signalExceptionForError(env, err);
return NULL; return NULL;
} }
size_t childHandle; size_t childHandle;
status_t err = ::android::hardware::readEmbeddedFromParcel( err = ::android::hardware::readEmbeddedFromParcel(
const_cast<hidl_vec<bool> *>(vec), const_cast<hidl_vec<bool> *>(vec),
*parcel, *parcel,
parentHandle, parentHandle,
@@ -701,16 +703,17 @@ static jobjectArray JHwParcel_native_readStringVector(
size_t parentHandle; size_t parentHandle;
const string_vec *vec= const string_vec *vec;
(const string_vec *)parcel->readBuffer(&parentHandle); status_t err = parcel->readBuffer(&parentHandle,
reinterpret_cast<const void **>(&vec));
if (vec == NULL) { if (err != OK) {
signalExceptionForError(env, UNKNOWN_ERROR); signalExceptionForError(env, err);
return NULL; return NULL;
} }
size_t childHandle; size_t childHandle;
status_t err = ::android::hardware::readEmbeddedFromParcel( err = ::android::hardware::readEmbeddedFromParcel(
const_cast<string_vec *>(vec), const_cast<string_vec *>(vec),
*parcel, parentHandle, 0 /* parentOffset */, &childHandle); *parcel, parentHandle, 0 /* parentOffset */, &childHandle);
@@ -807,9 +810,10 @@ static jobject JHwParcel_native_readBuffer(JNIEnv *env, jobject thiz) {
JHwParcel::GetNativeContext(env, thiz)->getParcel(); JHwParcel::GetNativeContext(env, thiz)->getParcel();
size_t handle; size_t handle;
const void *ptr = parcel->readBuffer(&handle); const void *ptr;
status_t status = parcel->readBuffer(&handle, &ptr);
if (ptr == nullptr) { if (status != OK) {
jniThrowException(env, "java/util/NoSuchElementException", NULL); jniThrowException(env, "java/util/NoSuchElementException", NULL);
return nullptr; return nullptr;
} }
@@ -824,10 +828,11 @@ static jobject JHwParcel_native_readEmbeddedBuffer(
size_t childHandle; size_t childHandle;
const void *ptr = const void *ptr;
parcel->readEmbeddedBuffer(&childHandle, parentHandle, offset); status_t status =
parcel->readEmbeddedBuffer(&childHandle, parentHandle, offset, &ptr);
if (ptr == nullptr) { if (status != OK) {
jniThrowException(env, "java/util/NoSuchElementException", NULL); jniThrowException(env, "java/util/NoSuchElementException", NULL);
return 0; return 0;
} }