diff options
| author | Adrian Roos <roosa@google.com> | 2015-10-23 17:21:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-23 17:21:23 +0000 |
| commit | cf33d50d25c5660bf1d4325c11433fb281bc31cb (patch) | |
| tree | 18cd0af5001fa3b009c90771e5f2927ff07ad96f /include | |
| parent | 18e7c64ea82e002978ef069884d195e02e7302df (diff) | |
| parent | 6bb3114246f6f6aa406e65452dbaa12b135029ea (diff) | |
| download | frameworks_native-cf33d50d25c5660bf1d4325c11433fb281bc31cb.zip frameworks_native-cf33d50d25c5660bf1d4325c11433fb281bc31cb.tar.gz frameworks_native-cf33d50d25c5660bf1d4325c11433fb281bc31cb.tar.bz2 | |
Merge changes from topic 'parcel-v2' into mnc-dr-dev
* changes:
Maintain Parcel ABI
Revert "Revert "Track ashmem memory usage in Parcel""
Diffstat (limited to 'include')
| -rw-r--r-- | include/binder/Parcel.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/binder/Parcel.h b/include/binder/Parcel.h index 3ada1e9..16cd6cf 100644 --- a/include/binder/Parcel.h +++ b/include/binder/Parcel.h @@ -341,10 +341,12 @@ public: }; private: - size_t mBlobAshmemSize; + size_t mOpenAshmemSize; public: + // TODO: Remove once ABI can be changed. size_t getBlobAshmemSize() const; + size_t getOpenAshmemSize() const; }; // --------------------------------------------------------------------------- |