diff options
| author | Mathias Agopian <mathias@google.com> | 2010-12-07 17:24:03 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-07 17:24:03 -0800 |
| commit | f30c8287525ac049d4d7589a330be5713256046b (patch) | |
| tree | 57485c30f1f124146eed3361ceeeb25324a835a6 /include/ui | |
| parent | 2460a5fa23ca36b91f5759d49339911461833c2d (diff) | |
| parent | 48f42f8c3fbd33b2f46c6290ff5963dd58938cf9 (diff) | |
| download | frameworks_base-f30c8287525ac049d4d7589a330be5713256046b.zip frameworks_base-f30c8287525ac049d4d7589a330be5713256046b.tar.gz frameworks_base-f30c8287525ac049d4d7589a330be5713256046b.tar.bz2 | |
am 48f42f8c: am 4153bf3a: Merge "[3171580] don\'t automatically log GraphicBuffer allocation failures" into gingerbread
* commit '48f42f8c3fbd33b2f46c6290ff5963dd58938cf9':
[3171580] don't automatically log GraphicBuffer allocation failures
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 c446633..aa65d93 100644 --- a/include/ui/GraphicBuffer.h +++ b/include/ui/GraphicBuffer.h @@ -91,12 +91,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 { |