diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-05-13 16:46:43 +0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-05-13 16:46:43 +0400 |
| commit | 4eef45b89b704bddf4670526dc20e043876e9f76 (patch) | |
| tree | d436841558190b5d357b46097d04d4276cb013e3 /include | |
| parent | af3ecfc0802a306e6e768c80d3b6a2d029f3b27f (diff) | |
| parent | 738b6a8dfdcd7b38c7178f8d70d3d69c33f16551 (diff) | |
| download | frameworks_base-4eef45b89b704bddf4670526dc20e043876e9f76.zip frameworks_base-4eef45b89b704bddf4670526dc20e043876e9f76.tar.gz frameworks_base-4eef45b89b704bddf4670526dc20e043876e9f76.tar.bz2 | |
Merge "MemoryHeapBase: ifdef for gingerbread compatibility" into ics
Diffstat (limited to 'include')
| -rw-r--r-- | include/binder/IMemory.h | 3 | ||||
| -rw-r--r-- | include/binder/MemoryHeapBase.h | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/binder/IMemory.h b/include/binder/IMemory.h index 2d0db00..d56eafd 100644 --- a/include/binder/IMemory.h +++ b/include/binder/IMemory.h @@ -43,8 +43,9 @@ public: virtual void* getBase() const = 0; virtual size_t getSize() const = 0; virtual uint32_t getFlags() const = 0; +#ifndef BINDER_COMPAT virtual uint32_t getOffset() const = 0; - +#endif // these are there just for backward source compatibility int32_t heapID() const { return getHeapID(); } void* base() const { return getBase(); } diff --git a/include/binder/MemoryHeapBase.h b/include/binder/MemoryHeapBase.h index bbbda9c..137dcfd 100644 --- a/include/binder/MemoryHeapBase.h +++ b/include/binder/MemoryHeapBase.h @@ -61,8 +61,9 @@ public: virtual void* getBase() const; virtual size_t getSize() const; virtual uint32_t getFlags() const; - virtual uint32_t getOffset() const; - +#ifndef BINDER_COMPAT + virtual uint32_t getOffset() const; +#endif const char* getDevice() const; /* this closes this heap -- use carefully */ @@ -91,7 +92,9 @@ private: uint32_t mFlags; const char* mDevice; bool mNeedUnmap; +#ifndef BINDER_COMPAT uint32_t mOffset; +#endif }; // --------------------------------------------------------------------------- |