summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorIliyan Malchev <malchev@google.com>2009-11-02 15:07:04 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-02 15:07:04 -0800
commit8ba42ba83b206929c4c13c0b8ef24de87a92f42c (patch)
treee1c4b46396275be44634ed090e0b2f867c8f48bc /include
parentfb1d992f4b8addad729a94cb006a732a40b62756 (diff)
parentcd767bfd1c8e3103f99207ecfa34385e76518e82 (diff)
downloadframeworks_base-8ba42ba83b206929c4c13c0b8ef24de87a92f42c.zip
frameworks_base-8ba42ba83b206929c4c13c0b8ef24de87a92f42c.tar.gz
frameworks_base-8ba42ba83b206929c4c13c0b8ef24de87a92f42c.tar.bz2
am cd767bfd: am d4649b2f: Merge change Ibaef6141 into eclair
Merge commit 'cd767bfd1c8e3103f99207ecfa34385e76518e82' into eclair-mr2-plus-aosp * commit 'cd767bfd1c8e3103f99207ecfa34385e76518e82': libbinder: add a NO_CACHING flag to MemoryHeapBase
Diffstat (limited to 'include')
-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
};
/*