summaryrefslogtreecommitdiffstats
path: root/include/binder/MemoryHeapBase.h
diff options
context:
space:
mode:
authorIliyan Malchev <malchev@google.com>2009-11-02 15:01:36 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-02 15:01:36 -0800
commitcd767bfd1c8e3103f99207ecfa34385e76518e82 (patch)
tree533445ad1d5185881897b0c4261a8f56bfa7775b /include/binder/MemoryHeapBase.h
parent1166ff76eb3dbb5304dc40b3056e48c2c9dc7577 (diff)
parentd4649b2f8ea8285a4eb3c47e87520c7835e6c672 (diff)
downloadframeworks_base-cd767bfd1c8e3103f99207ecfa34385e76518e82.zip
frameworks_base-cd767bfd1c8e3103f99207ecfa34385e76518e82.tar.gz
frameworks_base-cd767bfd1c8e3103f99207ecfa34385e76518e82.tar.bz2
am d4649b2f: Merge change Ibaef6141 into eclair
Merge commit 'd4649b2f8ea8285a4eb3c47e87520c7835e6c672' into eclair-mr2 * commit 'd4649b2f8ea8285a4eb3c47e87520c7835e6c672': libbinder: add a NO_CACHING flag to MemoryHeapBase
Diffstat (limited to 'include/binder/MemoryHeapBase.h')
-rw-r--r--include/binder/MemoryHeapBase.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/binder/MemoryHeapBase.h b/include/binder/MemoryHeapBase.h
index 435540e..d793c24 100644
--- a/include/binder/MemoryHeapBase.h
+++ b/include/binder/MemoryHeapBase.h
@@ -35,7 +35,8 @@ public:
MAP_ONCE = IMemoryHeap::MAP_ONCE,
// memory won't be mapped locally, but will be mapped in the remote
// process.
- DONT_MAP_LOCALLY = 0x00000100
+ DONT_MAP_LOCALLY = 0x00000100,
+ NO_CACHING = 0x00000200
};
/*