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

Commit 2487e1c2 authored by Jason Sams's avatar Jason Sams Committed by Android Git Automerger
Browse files

am 39dbb099: Merge change I36176536 into eclair 

Merge commit '39dbb099' into eclair-plus-aosp

* commit '39dbb099':
  Fix ref counting bug that could cause memory leak in allApps.
parents 6f8797a7 39dbb099

libs/rs/rsAllocation.cpp

+1 −2
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ void Allocation::dumpLOGV(const char *prefix) const 
    LOGV("%s allocation ptr=%p mCpuWrite=%i, mCpuRead=%i, mGpuWrite=%i, mGpuRead=%i",

          prefix, mPtr, mCpuWrite, mCpuRead, mGpuWrite, mGpuRead);



    LOGV("%s allocation mIsTexture=%i mIsTextureID=%i, mIsVertexBuffer=%i, mBufferID=%i",

    LOGV("%s allocation mIsTexture=%i mTextureID=%i, mIsVertexBuffer=%i, mBufferID=%i",

          prefix, mIsTexture, mTextureID, mIsVertexBuffer, mBufferID);
@@ -400,7 +400,6 @@ RsAllocation rsi_AllocationCreateFromBitmap(Context *rsc, uint32_t w, uint32_t h 
        LOGE("Memory allocation failure");

        return NULL;

    }

    texAlloc->incUserRef();



    ElementConverter_t cvt = pickConverter(dst, src);

    cvt(texAlloc->getPtr(), data, w * h);