Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

* commit '966fcb81eece9096040ccc185bb662335d3964cf':
  Revert "fix [2542425] memory leak during video recording"
This commit is contained in:
Dianne Hackborn
2010-03-30 21:10:45 -07:00
committed by Android Git Automerger
parent 65bfca37fe 966fcb81ee
commit b19b6fec04
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/utils/VectorImpl.cpp
View File

@@ -351,7 +351,6 @@ void* VectorImpl::_grow(size_t where, size_t amount)
{ {
const SharedBuffer* cur_sb = SharedBuffer::sharedBuffer(mStorage); const SharedBuffer* cur_sb = SharedBuffer::sharedBuffer(mStorage);
SharedBuffer* sb = cur_sb->editResize(new_capacity * mItemSize); SharedBuffer* sb = cur_sb->editResize(new_capacity * mItemSize);
release_storage();
mStorage = sb->data(); mStorage = sb->data();
} else { } else {
SharedBuffer* sb = SharedBuffer::alloc(new_capacity * mItemSize); 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); const SharedBuffer* cur_sb = SharedBuffer::sharedBuffer(mStorage);
SharedBuffer* sb = cur_sb->editResize(new_capacity * mItemSize); SharedBuffer* sb = cur_sb->editResize(new_capacity * mItemSize);
release_storage();
mStorage = sb->data(); mStorage = sb->data();
} else { } else {
SharedBuffer* sb = SharedBuffer::alloc(new_capacity * mItemSize); SharedBuffer* sb = SharedBuffer::alloc(new_capacity * mItemSize);