am b7733870: Merge "Aligning native Parcel implementation to Java."

* commit 'b77338703f812cceb5458664d7690e37688de07f':
  Aligning native Parcel implementation to Java.
This commit is contained in:
Jean-Baptiste Queru
2012-06-08 08:17:57 -07:00
committed by Android Git Automerger

View File

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