Merge "Aligning native Parcel implementation to Java."

This commit is contained in:
Jean-Baptiste Queru
2012-06-08 08:03:03 -07:00
committed by android code review

View File

@@ -1047,10 +1047,11 @@ int32_t Parcel::readExceptionCode() const
{ {
int32_t exception_code = readAligned<int32_t>(); int32_t exception_code = readAligned<int32_t>();
if (exception_code == EX_HAS_REPLY_HEADER) { if (exception_code == EX_HAS_REPLY_HEADER) {
int32_t header_start = dataPosition();
int32_t header_size = readAligned<int32_t>(); int32_t header_size = readAligned<int32_t>();
// Skip over fat responses headers. Not used (or propagated) in // Skip over fat responses headers. Not used (or propagated) in
// native code // native code
setDataPosition(dataPosition() + header_size); setDataPosition(header_start + header_size);
// And fat response headers are currently only used when there are no // And fat response headers are currently only used when there are no
// exceptions, so return no error: // exceptions, so return no error:
return 0; return 0;