diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-03-27 22:28:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-27 22:28:11 +0000 |
| commit | 80a2f030517ec70173b2a8cc5a358b9683a71aa0 (patch) | |
| tree | ada75b659ef1ba5568cf7d025833f01b003f837b /libs | |
| parent | 7289b6497678da291b390dadbbd4a385f18f4aa1 (diff) | |
| parent | 6546f2e45861172af83b0c1e6432cae24e97d4cc (diff) | |
| download | frameworks_native-80a2f030517ec70173b2a8cc5a358b9683a71aa0.zip frameworks_native-80a2f030517ec70173b2a8cc5a358b9683a71aa0.tar.gz frameworks_native-80a2f030517ec70173b2a8cc5a358b9683a71aa0.tar.bz2 | |
Merge "Allow creation of heaps that are read-only to partner"
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/binder/MemoryDealer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/MemoryDealer.cpp b/libs/binder/MemoryDealer.cpp index a14c100..8739625 100644 --- a/libs/binder/MemoryDealer.cpp +++ b/libs/binder/MemoryDealer.cpp @@ -225,8 +225,8 @@ Allocation::~Allocation() // ---------------------------------------------------------------------------- -MemoryDealer::MemoryDealer(size_t size, const char* name) - : mHeap(new MemoryHeapBase(size, 0, name)), +MemoryDealer::MemoryDealer(size_t size, const char* name, uint32_t flags) + : mHeap(new MemoryHeapBase(size, flags, name)), mAllocator(new SimpleBestFitAllocator(size)) { } |