diff options
| author | Mathias Agopian <mathias@google.com> | 2010-04-19 19:26:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-19 19:26:31 -0700 |
| commit | 26f6163557980062dbb203388b3d0794ee0d06f7 (patch) | |
| tree | 315ed8f9b1a5688854e16eeef72dcd86b10f8e2e /include | |
| parent | 0679876997a5523a7539b8fe2c74a39434b17820 (diff) | |
| parent | 0a4ab1b9b4c7b891c1ecb67eed99e9c9b30c93aa (diff) | |
| download | frameworks_base-26f6163557980062dbb203388b3d0794ee0d06f7.zip frameworks_base-26f6163557980062dbb203388b3d0794ee0d06f7.tar.gz frameworks_base-26f6163557980062dbb203388b3d0794ee0d06f7.tar.bz2 | |
am 0a4ab1b9: Merge "fix [2599939] "cannot play video" after open/close a video player a dozen of times" into froyo
Merge commit '0a4ab1b9b4c7b891c1ecb67eed99e9c9b30c93aa' into froyo-plus-aosp
* commit '0a4ab1b9b4c7b891c1ecb67eed99e9c9b30c93aa':
fix [2599939] "cannot play video" after open/close a video player a dozen of times
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 */ |