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

Commit 6aa06014 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 966fcb81: Revert "fix [2542425] memory leak during video recording" 

Merge commit '966fcb81eece9096040ccc185bb662335d3964cf' into froyo-plus-aosp

* commit '966fcb81eece9096040ccc185bb662335d3964cf':
  Revert "fix [2542425] memory leak during video recording"
parents 09a90659 c85e12e0

libs/utils/VectorImpl.cpp

+0 −2
Original line number Diff line number Diff line
@@ -351,7 +351,6 @@ void* VectorImpl::_grow(size_t where, size_t amount) 
        {

            const SharedBuffer* cur_sb = SharedBuffer::sharedBuffer(mStorage);

            SharedBuffer* sb = cur_sb->editResize(new_capacity * mItemSize);

            release_storage();

            mStorage = sb->data();

        } else {

            SharedBuffer* sb = SharedBuffer::alloc(new_capacity * mItemSize);
@@ -404,7 +403,6 @@ void VectorImpl::_shrink(size_t where, size_t amount) 
        {

            const SharedBuffer* cur_sb = SharedBuffer::sharedBuffer(mStorage);

            SharedBuffer* sb = cur_sb->editResize(new_capacity * mItemSize);

            release_storage();

            mStorage = sb->data();

        } else {

            SharedBuffer* sb = SharedBuffer::alloc(new_capacity * mItemSize);