diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-22 09:29:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-22 09:29:00 -0700 |
| commit | 298cb4ff6a792e475af7a32093dd0b7cdfde7486 (patch) | |
| tree | b594e7e306e0808afbeecf2ca73b7e943a6a5176 /include | |
| parent | 7e1bf6cb8545da18bafd4ccd0587c8000a76c2b8 (diff) | |
| parent | f0adf848ffffeca86f4c0210ea237883d9e5e8d5 (diff) | |
| download | frameworks_native-298cb4ff6a792e475af7a32093dd0b7cdfde7486.zip frameworks_native-298cb4ff6a792e475af7a32093dd0b7cdfde7486.tar.gz frameworks_native-298cb4ff6a792e475af7a32093dd0b7cdfde7486.tar.bz2 | |
Merge change 7529
* changes:
Make MemoryDealer's destructor protected instead of public.
Diffstat (limited to 'include')
| -rw-r--r-- | include/binder/MemoryDealer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/binder/MemoryDealer.h b/include/binder/MemoryDealer.h index 6628f75..03ac70a 100644 --- a/include/binder/MemoryDealer.h +++ b/include/binder/MemoryDealer.h @@ -218,8 +218,6 @@ public: const sp<HeapInterface>& heap, const sp<AllocatorInterface>& allocator); - virtual ~MemoryDealer(); - virtual sp<IMemory> allocate(size_t size, uint32_t flags = 0); virtual void deallocate(size_t offset); virtual void dump(const char* what, uint32_t flags = 0) const; @@ -228,6 +226,9 @@ public: sp<IMemoryHeap> getMemoryHeap() const { return heap(); } sp<AllocatorInterface> getAllocator() const { return allocator(); } +protected: + virtual ~MemoryDealer(); + private: const sp<HeapInterface>& heap() const; const sp<AllocatorInterface>& allocator() const; |