ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 57fcc92e: am 7b190511: fix a crasher when running out of memory

Browse Source 
* commit '57fcc92e2cb1d86bfba5d0444cbf58195059b168':
  fix a crasher when running out of memory
This commit is contained in:
Mathias Agopian 2012-09-25 15:57:27 -07:00 committed by Android Git Automerger
commit 54d2f94651
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/binder/MemoryHeapBase.h
View File

@ -58,10 +58,13 @@ public:
/* implement IMemoryHeap interface */
virtual int getHeapID() const;
/* virtual address of the heap. returns MAP_FAILED in case of error */
virtual void* getBase() const;
virtual size_t getSize() const;
virtual uint32_t getFlags() const;
virtual uint32_t getOffset() const;
virtual uint32_t getOffset() const;
const char* getDevice() const;

2
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -2497,7 +2497,7 @@ status_t SurfaceFlinger::captureScreenImplLocked(const sp<IBinder>& display,
sp<MemoryHeapBase> base(
new MemoryHeapBase(size, 0, "screen-capture") );
void* const ptr = base->getBase();
if (ptr) {
if (ptr != MAP_FAILED) {
// capture the screen with glReadPixels()
ScopedTrace _t(ATRACE_TAG, "glReadPixels");
glReadPixels(0, 0, sw, sh, GL_RGBA, GL_UNSIGNED_BYTE, ptr);