diff options
| author | Mathias Agopian <mathias@google.com> | 2010-04-19 19:09:03 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2010-04-19 19:09:03 -0700 |
| commit | 92c3b393275e967f37162b40b3438c5616328372 (patch) | |
| tree | 14f077c0233038875cc90dd8eb107decb117b667 /include | |
| parent | e80c6f49d5055e299b7ada91b5967feab66e467b (diff) | |
| download | frameworks_base-92c3b393275e967f37162b40b3438c5616328372.zip frameworks_base-92c3b393275e967f37162b40b3438c5616328372.tar.gz frameworks_base-92c3b393275e967f37162b40b3438c5616328372.tar.bz2 | |
fix [2599939] "cannot play video" after open/close a video player a dozen of times
get rid off the MAP_ONCE flag is MemoryHeapBase (as well as it's functionality),
this feature should not be used anymore.
the software renderer was incorrectly using the default ctor which set MAP_ONCE,
causing the leak. the software renderer itself is incorrectly used while coming
back from sleep.
Change-Id: I123621f8d140550b864f352bbcd8a5729db12b57
Diffstat (limited to 'include')
| -rw-r--r-- | include/binder/IMemory.h | 3 | ||||
| -rw-r--r-- | include/binder/MemoryHeapBase.h | 1 | ||||
| -rw-r--r-- | include/binder/MemoryHeapPmem.h | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/include/binder/IMemory.h b/include/binder/IMemory.h index ae042cb..74d2cc7 100644 --- a/include/binder/IMemory.h +++ b/include/binder/IMemory.h @@ -36,8 +36,7 @@ public: // flags returned by getFlags() enum { - READ_ONLY = 0x00000001, - MAP_ONCE = 0x00000002 + READ_ONLY = 0x00000001 }; virtual int getHeapID() const = 0; diff --git a/include/binder/MemoryHeapBase.h b/include/binder/MemoryHeapBase.h index d793c24..2f2e31b 100644 --- a/include/binder/MemoryHeapBase.h +++ b/include/binder/MemoryHeapBase.h @@ -32,7 +32,6 @@ class MemoryHeapBase : public virtual BnMemoryHeap public: enum { READ_ONLY = IMemoryHeap::READ_ONLY, - MAP_ONCE = IMemoryHeap::MAP_ONCE, // memory won't be mapped locally, but will be mapped in the remote // process. DONT_MAP_LOCALLY = 0x00000100, diff --git a/include/binder/MemoryHeapPmem.h b/include/binder/MemoryHeapPmem.h index aac164f..e1660c4 100644 --- a/include/binder/MemoryHeapPmem.h +++ b/include/binder/MemoryHeapPmem.h @@ -46,8 +46,7 @@ public: sp<MemoryHeapPmem> mClientHeap; }; - MemoryHeapPmem(const sp<MemoryHeapBase>& pmemHeap, - uint32_t flags = IMemoryHeap::MAP_ONCE); + MemoryHeapPmem(const sp<MemoryHeapBase>& pmemHeap, uint32_t flags = 0); ~MemoryHeapPmem(); /* HeapInterface additions */ |