Merge change 7529

* changes:
  Make MemoryDealer's destructor protected instead of public.
This commit is contained in:
Android (Google) Code Review
2009-07-22 09:29:00 -07:00

View File

@@ -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;