diff options
| author | Ian Pedowitz <ijpedowitz@google.com> | 2015-10-22 22:32:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-22 22:32:07 +0000 |
| commit | 159a5c337250613c166ae45b2811861f70c733bd (patch) | |
| tree | 1a26bcab4226d26c54ad2bad041522d8007707d2 /include | |
| parent | a0c1be26177d554ef9c5d61b8a564bb03d402a04 (diff) | |
| parent | 6880307e8e35a6c484942443fb4ddd6173126152 (diff) | |
| download | frameworks_native-159a5c337250613c166ae45b2811861f70c733bd.zip frameworks_native-159a5c337250613c166ae45b2811861f70c733bd.tar.gz frameworks_native-159a5c337250613c166ae45b2811861f70c733bd.tar.bz2 | |
Revert "Track ashmem memory usage in Parcel"
am: 6880307e8e
* commit '6880307e8e35a6c484942443fb4ddd6173126152':
Revert "Track ashmem memory usage in Parcel"
Diffstat (limited to 'include')
| -rw-r--r-- | include/binder/Parcel.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/binder/Parcel.h b/include/binder/Parcel.h index 220a935..3ada1e9 100644 --- a/include/binder/Parcel.h +++ b/include/binder/Parcel.h @@ -342,11 +342,9 @@ public: private: size_t mBlobAshmemSize; - size_t mOpenAshmemSize; public: size_t getBlobAshmemSize() const; - size_t getOpenAshmemSize() const; }; // --------------------------------------------------------------------------- @@ -414,9 +412,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); |