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 /libs | |
| 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 'libs')
| -rw-r--r-- | libs/binder/Parcel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 6ed85d7..a0fc4d0 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -353,12 +353,12 @@ status_t Parcel::setData(const uint8_t* buffer, size_t len) return err; } -status_t Parcel::appendFrom(Parcel *parcel, size_t offset, size_t len) +status_t Parcel::appendFrom(const Parcel *parcel, size_t offset, size_t len) { const sp<ProcessState> proc(ProcessState::self()); status_t err; - uint8_t *data = parcel->mData; - size_t *objects = parcel->mObjects; + const uint8_t *data = parcel->mData; + const size_t *objects = parcel->mObjects; size_t size = parcel->mObjectsSize; int startPos = mDataPos; int firstIndex = -1, lastIndex = -2; |