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

Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." am: 8cc1343724

Browse Source 
am: 2187dc5ca1

Change-Id: If0919864026c78fed76df1554235c2acca9f2750
This commit is contained in:
Yifan Hong
2016-11-15 03:12:43 +00:00
committed by android-build-merger
parent 31264c994c 2187dc5ca1
commit 41579ea4d4
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/jni/android_os_HwParcel.cpp
View File

@@ -425,8 +425,8 @@ static void JHwParcel_native_writeString(
status_t err = parcel->writeBuffer(s, sizeof(*s), &parentHandle); status_t err = parcel->writeBuffer(s, sizeof(*s), &parentHandle);
if (err == OK) { if (err == OK) {
err = s->writeEmbeddedToParcel( err = ::android::hardware::writeEmbeddedToParcel(
parcel, parentHandle, 0 /* parentOffset */); *s, parcel, parentHandle, 0 /* parentOffset */);
} }
signalExceptionForError(env, err); signalExceptionForError(env, err);
@@ -453,7 +453,8 @@ static void JHwParcel_native_write ## Suffix ## Vector( \
if (err == OK) { \ if (err == OK) { \
size_t childHandle; \ size_t childHandle; \
\ \
err = vec->writeEmbeddedToParcel( \ err = ::android::hardware::writeEmbeddedToParcel( \
*vec, \
parcel, \ parcel, \
parentHandle, \ parentHandle, \
0 /* parentOffset */, \ 0 /* parentOffset */, \
@@ -508,7 +509,8 @@ static void JHwParcel_native_writeBoolVector(
if (err == OK) { if (err == OK) {
size_t childHandle; size_t childHandle;
err = vec->writeEmbeddedToParcel( err = ::android::hardware::writeEmbeddedToParcel(
*vec,
parcel, parcel,
parentHandle, parentHandle,
0 /* parentOffset */, 0 /* parentOffset */,
@@ -568,7 +570,8 @@ static jstring JHwParcel_native_readString(JNIEnv *env, jobject thiz) {
return NULL; return NULL;
} }
status_t err = const_cast<hidl_string *>(s)->readEmbeddedFromParcel( status_t err = ::android::hardware::readEmbeddedFromParcel(
const_cast<hidl_string *>(s),
*parcel, parentHandle, 0 /* parentOffset */); *parcel, parentHandle, 0 /* parentOffset */);
if (err != OK) { if (err != OK) {
@@ -597,8 +600,8 @@ static Type ## Array JHwParcel_native_read ## Suffix ## Vector( \
\ \
size_t childHandle; \ size_t childHandle; \
\ \
status_t err = const_cast<hidl_vec<Type> *>(vec) \ status_t err = ::android::hardware::readEmbeddedFromParcel( \
->readEmbeddedFromParcel( \ const_cast<hidl_vec<Type> *>(vec), \
*parcel, \ *parcel, \
parentHandle, \ parentHandle, \
0 /* parentOffset */, \ 0 /* parentOffset */, \
@@ -639,8 +642,8 @@ static jbooleanArray JHwParcel_native_readBoolVector(
size_t childHandle; size_t childHandle;
status_t err = const_cast<hidl_vec<bool> *>(vec) status_t err = ::android::hardware::readEmbeddedFromParcel(
->readEmbeddedFromParcel( const_cast<hidl_vec<bool> *>(vec),
*parcel, *parcel,
parentHandle, parentHandle,
0 /* parentOffset */, 0 /* parentOffset */,
@@ -701,12 +704,13 @@ static jobjectArray JHwParcel_native_readStringVector(
} }
size_t childHandle; size_t childHandle;
status_t err = const_cast<string_vec *>(vec)->readEmbeddedFromParcel( status_t err = ::android::hardware::readEmbeddedFromParcel(
const_cast<string_vec *>(vec),
*parcel, parentHandle, 0 /* parentOffset */, &childHandle); *parcel, parentHandle, 0 /* parentOffset */, &childHandle);
for (size_t i = 0; (err == OK) && (i < vec->size()); ++i) { for (size_t i = 0; (err == OK) && (i < vec->size()); ++i) {
err = const_cast<hidl_vec<hidl_string> *>(vec) err = android::hardware::readEmbeddedFromParcel(
->readEmbeddedFromParcel( const_cast<hidl_vec<hidl_string> *>(vec),
*parcel, *parcel,
childHandle, childHandle,
i * sizeof(hidl_string), i * sizeof(hidl_string),
@@ -760,14 +764,16 @@ static void JHwParcel_native_writeStringVector(
if (err == OK) { if (err == OK) {
size_t childHandle; size_t childHandle;
err = vec->writeEmbeddedToParcel( err = ::android::hardware::writeEmbeddedToParcel(
*vec,
parcel, parcel,
parentHandle, parentHandle,
0 /* parentOffset */, 0 /* parentOffset */,
&childHandle); &childHandle);
for (size_t i = 0; (err == OK) && (i < vec->size()); ++i) { for (size_t i = 0; (err == OK) && (i < vec->size()); ++i) {
err = (*vec)[i].writeEmbeddedToParcel( err = ::android::hardware::writeEmbeddedToParcel(
(*vec)[i],
parcel, parcel,
childHandle, childHandle,
i * sizeof(hidl_string)); i * sizeof(hidl_string));