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 | 90443e67a5fe826b9c0a4fce38febeeedac8f498 (patch) | |
| tree | 3e99e3e5fd3993f5efbcf967a74a464bdc163383 /include | |
| parent | 0f5ad842fb3fbc0df2a4c8028940810782cedacc (diff) | |
| parent | 262a583f2da846e8c74d82712957bcdcc88d169a (diff) | |
| download | frameworks_base-90443e67a5fe826b9c0a4fce38febeeedac8f498.zip frameworks_base-90443e67a5fe826b9c0a4fce38febeeedac8f498.tar.gz frameworks_base-90443e67a5fe826b9c0a4fce38febeeedac8f498.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; |