diff options
| author | Mathias Agopian <mathias@google.com> | 2010-02-01 12:07:56 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-01 12:07:56 -0800 |
| commit | 2c94dac323bcf5c717a90b119648b6905d2c47a0 (patch) | |
| tree | 03d6b38467223e9ff51f1782b39ddc1648fbb746 /core/jni | |
| parent | 5292ccd6bb92ff69faa45ac551d5b2c79f52e891 (diff) | |
| parent | d1f74d0e3352987467f12a65b8685b60b057d9ad (diff) | |
| download | frameworks_base-2c94dac323bcf5c717a90b119648b6905d2c47a0.zip frameworks_base-2c94dac323bcf5c717a90b119648b6905d2c47a0.tar.gz frameworks_base-2c94dac323bcf5c717a90b119648b6905d2c47a0.tar.bz2 | |
Merge "Don't use the MemoryDealer in CursorWindow, it's not necessary."
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/CursorWindow.cpp | 17 | ||||
| -rw-r--r-- | core/jni/CursorWindow.h | 5 |
2 files changed, 11 insertions, 11 deletions
diff --git a/core/jni/CursorWindow.cpp b/core/jni/CursorWindow.cpp index 694514e..7877921 100644 --- a/core/jni/CursorWindow.cpp +++ b/core/jni/CursorWindow.cpp @@ -18,7 +18,8 @@ #define LOG_TAG "CursorWindow" #include <utils/Log.h> -#include <binder/MemoryDealer.h> +#include <binder/MemoryHeapBase.h> +#include <binder/MemoryBase.h> #include <assert.h> #include <string.h> @@ -37,7 +38,7 @@ CursorWindow::CursorWindow(size_t maxSize) : { } -bool CursorWindow::setMemory(sp<IMemory> memory) +bool CursorWindow::setMemory(const sp<IMemory>& memory) { mMemory = memory; mData = (uint8_t *) memory->pointer(); @@ -47,7 +48,6 @@ bool CursorWindow::setMemory(sp<IMemory> memory) mHeader = (window_header_t *) mData; // Make the window read-only - mHeap = NULL; ssize_t size = memory->size(); mSize = size; mMaxSize = size; @@ -60,9 +60,10 @@ bool CursorWindow::initBuffer(bool localOnly) { //TODO Use a non-memory dealer mmap region for localOnly - mHeap = new MemoryDealer(mMaxSize, "CursorWindow"); - if (mHeap != NULL) { - mMemory = mHeap->allocate(mMaxSize); + sp<MemoryHeapBase> heap; + heap = new MemoryHeapBase(mMaxSize, 0, "CursorWindow"); + if (heap != NULL) { + mMemory = new MemoryBase(heap, 0, mMaxSize); if (mMemory != NULL) { mData = (uint8_t *) mMemory->pointer(); if (mData) { @@ -75,10 +76,10 @@ bool CursorWindow::initBuffer(bool localOnly) return true; } } - LOGE("memory dealer allocation failed"); + LOGE("CursorWindow heap allocation failed"); return false; } else { - LOGE("failed to create the memory dealer"); + LOGE("failed to create the CursorWindow heap"); return false; } } diff --git a/core/jni/CursorWindow.h b/core/jni/CursorWindow.h index e98b009..3fcb560 100644 --- a/core/jni/CursorWindow.h +++ b/core/jni/CursorWindow.h @@ -21,7 +21,7 @@ #include <stddef.h> #include <stdint.h> -#include <binder/MemoryDealer.h> +#include <binder/IMemory.h> #include <utils/RefBase.h> #include <jni.h> @@ -101,7 +101,7 @@ class CursorWindow public: CursorWindow(size_t maxSize); CursorWindow(){} - bool setMemory(sp<IMemory>); + bool setMemory(const sp<IMemory>&); ~CursorWindow(); bool initBuffer(bool localOnly); @@ -189,7 +189,6 @@ private: size_t mSize; size_t mMaxSize; window_header_t * mHeader; - sp<MemoryDealer> mHeap; sp<IMemory> mMemory; /** |