Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57fcc92e authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

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

* commit '7b190511':
  fix a crasher when running out of memory
parents 40e627c5 7b190511

include/binder/MemoryHeapBase.h

+4 −1
Original line number Diff line number Diff line
@@ -58,7 +58,10 @@ 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;

services/surfaceflinger/SurfaceFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);