summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorMagnus Strandberg <magnus.strandberg@sonyericsson.com>2012-06-08 08:32:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-08 08:32:28 -0700
commitbd3ad5b23fa026be35595ebf52633e2d51cfc1ca (patch)
tree56535b6f664ef9d26d67e9e7143ec789288d5208 /libs
parentaf1cb83516589034aedcbf211f1b66bd80250136 (diff)
parent1ba24574b2debd3ca012adbbd77f12bed4f2d266 (diff)
downloadframeworks_native-bd3ad5b23fa026be35595ebf52633e2d51cfc1ca.zip
frameworks_native-bd3ad5b23fa026be35595ebf52633e2d51cfc1ca.tar.gz
frameworks_native-bd3ad5b23fa026be35595ebf52633e2d51cfc1ca.tar.bz2
am 1ba24574: Aligning native Parcel implementation to Java.
* commit '1ba24574b2debd3ca012adbbd77f12bed4f2d266': Aligning native Parcel implementation to Java.
Diffstat (limited to 'libs')
-rw-r--r--libs/binder/Parcel.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index dea14bb..4c15913 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -1055,10 +1055,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;