diff options
author | Andreas Huber <andih@google.com> | 2011-04-18 08:12:36 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-18 08:12:36 -0700 |
commit | b0dfade955f2e2e19a827ca2119f3c5d319a824a (patch) | |
tree | bbbda0f558c45cecb2bff60498b9b77592882faf /include | |
parent | 2ecebd6f69db9a127f78ae32916d1e0066939b29 (diff) | |
parent | 0a47f4f711514ceb3e5f6d3ecdbc4c74f7b3bbef (diff) | |
download | frameworks_base-b0dfade955f2e2e19a827ca2119f3c5d319a824a.zip frameworks_base-b0dfade955f2e2e19a827ca2119f3c5d319a824a.tar.gz frameworks_base-b0dfade955f2e2e19a827ca2119f3c5d319a824a.tar.bz2 |
Merge "Parcel::appendFrom({const } Parcel *parcel, size_t, size_t)"
Diffstat (limited to 'include')
-rw-r--r-- | include/binder/Parcel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/binder/Parcel.h b/include/binder/Parcel.h index 32c9a1d5..bfe13f0 100644 --- a/include/binder/Parcel.h +++ b/include/binder/Parcel.h @@ -53,7 +53,8 @@ public: status_t setData(const uint8_t* buffer, size_t len); - status_t appendFrom(Parcel *parcel, size_t start, size_t len); + status_t appendFrom(const Parcel *parcel, + size_t start, size_t len); bool hasFileDescriptors() const; |