diff options
| author | Adrian Roos <roosa@google.com> | 2015-10-23 17:28:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-23 17:28:42 +0000 |
| commit | 0c11f9918c6f834f12d97315ef0247c08f8fef63 (patch) | |
| tree | cf17a87325553649be202d9d15014ce54c053ba2 /include | |
| parent | 6eac97d4baf77954c7d862e7bf35ed3763543491 (diff) | |
| parent | cf33d50d25c5660bf1d4325c11433fb281bc31cb (diff) | |
| download | frameworks_native-0c11f9918c6f834f12d97315ef0247c08f8fef63.zip frameworks_native-0c11f9918c6f834f12d97315ef0247c08f8fef63.tar.gz frameworks_native-0c11f9918c6f834f12d97315ef0247c08f8fef63.tar.bz2 | |
Merge changes from topic \'parcel-v2\' into mnc-dr-dev
am: cf33d50d25
* commit 'cf33d50d25c5660bf1d4325c11433fb281bc31cb':
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; }; // --------------------------------------------------------------------------- |