diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-07 17:07:16 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-07 17:07:16 -0800 |
| commit | 4951bcc16e99daafc44581e4222f012f9d419ae0 (patch) | |
| tree | 7be00878227a20b4610649a7d455db2d9cb3463c /include/binder | |
| parent | 53602ffde5527c476a1d7d39da12ecd7f58917f4 (diff) | |
| parent | a78c2e65e13cace4fdbb0295beca5b11de9fde06 (diff) | |
| download | frameworks_native-4951bcc16e99daafc44581e4222f012f9d419ae0.zip frameworks_native-4951bcc16e99daafc44581e4222f012f9d419ae0.tar.gz frameworks_native-4951bcc16e99daafc44581e4222f012f9d419ae0.tar.bz2 | |
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/frameworks/native into cm-13.0
Android 6.0.1 release 3
Change-Id: I437aaf148d440a8144afe1454948980fc3b40cca
Diffstat (limited to 'include/binder')
| -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 dc9757e..16cd6cf 100644 --- a/include/binder/Parcel.h +++ b/include/binder/Parcel.h @@ -340,13 +340,13 @@ public: inline void* data() { return mData; } }; -#ifndef DISABLE_ASHMEM_TRACKING private: - size_t mBlobAshmemSize; -#endif + size_t mOpenAshmemSize; public: + // TODO: Remove once ABI can be changed. size_t getBlobAshmemSize() const; + size_t getOpenAshmemSize() const; }; // --------------------------------------------------------------------------- |