diff options
| author | Adrian Roos <roosa@google.com> | 2015-10-22 16:46:12 -0700 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2015-10-22 17:48:16 -0700 |
| commit | 6bb3114246f6f6aa406e65452dbaa12b135029ea (patch) | |
| tree | 6fa571ad1b3d046bcd2d3d291860a2f98d84c2e5 /include | |
| parent | cbf3726357966539c2a685f46e61c3fc8937f19e (diff) | |
| download | frameworks_native-6bb3114246f6f6aa406e65452dbaa12b135029ea.zip frameworks_native-6bb3114246f6f6aa406e65452dbaa12b135029ea.tar.gz frameworks_native-6bb3114246f6f6aa406e65452dbaa12b135029ea.tar.bz2 | |
Maintain Parcel ABI
Makes sure we don't change the memory layout of the Parcel class
to maintain binary compatibility with prebuilts linking against
libbinder.
Bug: 25004154
Change-Id: I656687497f08bb85cefda796aafa2341e601e30a
Diffstat (limited to 'include')
| -rw-r--r-- | include/binder/Parcel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/binder/Parcel.h b/include/binder/Parcel.h index 220a935..16cd6cf 100644 --- a/include/binder/Parcel.h +++ b/include/binder/Parcel.h @@ -341,10 +341,10 @@ public: }; private: - size_t mBlobAshmemSize; size_t mOpenAshmemSize; public: + // TODO: Remove once ABI can be changed. size_t getBlobAshmemSize() const; size_t getOpenAshmemSize() const; }; @@ -414,9 +414,9 @@ inline TextOutput& operator<<(TextOutput& to, const Parcel& parcel) // Generic acquire and release of objects. void acquire_object(const sp<ProcessState>& proc, - const flat_binder_object& obj, const void* who, size_t* outAshmemSize); + const flat_binder_object& obj, const void* who); void release_object(const sp<ProcessState>& proc, - const flat_binder_object& obj, const void* who, size_t* outAshmemSize); + const flat_binder_object& obj, const void* who); void flatten_binder(const sp<ProcessState>& proc, const sp<IBinder>& binder, flat_binder_object* out); |