diff options
author | Iliyan Malchev <malchev@google.com> | 2009-11-02 15:02:03 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-02 15:02:03 -0800 |
commit | d7b4cbe5be903dbdd0f377fc03d2173abfa98bc8 (patch) | |
tree | 18d02a699fd19a305f54bbe1b3270ddc7ebe2cf6 /include | |
parent | f48d2e87b1c41369f59b1ebcdf89657bd736f330 (diff) | |
parent | d4649b2f8ea8285a4eb3c47e87520c7835e6c672 (diff) | |
download | frameworks_base-d7b4cbe5be903dbdd0f377fc03d2173abfa98bc8.zip frameworks_base-d7b4cbe5be903dbdd0f377fc03d2173abfa98bc8.tar.gz frameworks_base-d7b4cbe5be903dbdd0f377fc03d2173abfa98bc8.tar.bz2 |
am d4649b2f: Merge change Ibaef6141 into eclair
Merge commit 'd4649b2f8ea8285a4eb3c47e87520c7835e6c672' into eclair-plus-aosp
* commit 'd4649b2f8ea8285a4eb3c47e87520c7835e6c672':
libbinder: add a NO_CACHING flag to MemoryHeapBase
Diffstat (limited to 'include')
-rw-r--r-- | include/binder/MemoryHeapBase.h | 3 |
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 }; /* |