diff options
author | Mathias Agopian <mathias@google.com> | 2010-12-07 14:17:47 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-07 14:17:47 -0800 |
commit | 4153bf3a259624a2f2dc497b77b225a1fb517abc (patch) | |
tree | 1d5825784e0097f81c3994619e2570be79b5c912 /include/ui | |
parent | 0f74afbbf4bd0fe35889e26fc46f94c4ca6382d8 (diff) | |
parent | e869aee382cfe01d42dffba4912458a16bb791fb (diff) | |
download | frameworks_base-4153bf3a259624a2f2dc497b77b225a1fb517abc.zip frameworks_base-4153bf3a259624a2f2dc497b77b225a1fb517abc.tar.gz frameworks_base-4153bf3a259624a2f2dc497b77b225a1fb517abc.tar.bz2 |
Merge "[3171580] don't automatically log GraphicBuffer allocation failures" into gingerbread
Diffstat (limited to 'include/ui')
-rw-r--r-- | include/ui/GraphicBuffer.h | 5 | ||||
-rw-r--r-- | include/ui/GraphicBufferAllocator.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/ui/GraphicBuffer.h b/include/ui/GraphicBuffer.h index a3e85a9..6edc3ca 100644 --- a/include/ui/GraphicBuffer.h +++ b/include/ui/GraphicBuffer.h @@ -88,12 +88,15 @@ public: status_t lock(uint32_t usage, const Rect& rect, void** vaddr); status_t lock(GGLSurface* surface, uint32_t usage); status_t unlock(); - + android_native_buffer_t* getNativeBuffer() const; void setIndex(int index); int getIndex() const; + // for debugging + static void dumpAllocationsToSystemLog(); + private: virtual ~GraphicBuffer(); diff --git a/include/ui/GraphicBufferAllocator.h b/include/ui/GraphicBufferAllocator.h index 54b8236..dffa788 100644 --- a/include/ui/GraphicBufferAllocator.h +++ b/include/ui/GraphicBufferAllocator.h @@ -68,6 +68,7 @@ public: status_t free(buffer_handle_t handle); void dump(String8& res) const; + static void dumpToSystemLog(); private: struct alloc_rec_t { |