diff options
author | Mathias Agopian <mathias@google.com> | 2010-04-19 19:23:45 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-19 19:23:45 -0700 |
commit | 8288f66f0af45c82ffa2394a419e1f7c9393c048 (patch) | |
tree | 8009c8e46351dafac6774d3b9ce0483550333f92 /include | |
parent | 93bd90f80ff625ade8bb7284c377649f0c097dcf (diff) | |
parent | 3c772b706dd8e53fe17b284bb2e60c146867f787 (diff) | |
download | frameworks_native-8288f66f0af45c82ffa2394a419e1f7c9393c048.zip frameworks_native-8288f66f0af45c82ffa2394a419e1f7c9393c048.tar.gz frameworks_native-8288f66f0af45c82ffa2394a419e1f7c9393c048.tar.bz2 |
Merge "fix [2599939] "cannot play video" after open/close a video player a dozen of times" into froyo
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 */ |