diff options
| author | Santosh Madhava <smadhava@google.com> | 2011-02-23 09:59:07 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-23 09:59:07 -0800 |
| commit | bba9529d796654b0ac7a966261daf53706dfabc9 (patch) | |
| tree | 09d170b2bca3a86426f2b78268bb866f31cbf69f /media | |
| parent | 87e639bc151551c9618641a6765837b44eb90b9b (diff) | |
| parent | 3f48207ea4592ec0897f2043b2042a7114f8487d (diff) | |
| download | frameworks_base-bba9529d796654b0ac7a966261daf53706dfabc9.zip frameworks_base-bba9529d796654b0ac7a966261daf53706dfabc9.tar.gz frameworks_base-bba9529d796654b0ac7a966261daf53706dfabc9.tar.bz2 | |
Merge "Cleanup for issue 3471160 : video editor calls System.gc"
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/videoeditor/MediaArtistNativeHelper.java | 1 | ||||
| -rwxr-xr-x | media/java/android/media/videoeditor/MediaImageItem.java | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/media/java/android/media/videoeditor/MediaArtistNativeHelper.java b/media/java/android/media/videoeditor/MediaArtistNativeHelper.java index ad2bf95..e0df257 100644 --- a/media/java/android/media/videoeditor/MediaArtistNativeHelper.java +++ b/media/java/android/media/videoeditor/MediaArtistNativeHelper.java @@ -3807,7 +3807,6 @@ class MediaArtistNativeHelper { } catch (Throwable e) { // Allocating to new size with Fixed count try { - System.gc(); rgb888 = new int[thumbnailSize * MAX_THUMBNAIL_PERMITTED]; bitmaps = new Bitmap[MAX_THUMBNAIL_PERMITTED]; thumbnailCount = MAX_THUMBNAIL_PERMITTED; diff --git a/media/java/android/media/videoeditor/MediaImageItem.java b/media/java/android/media/videoeditor/MediaImageItem.java index 69088ed..4faa83a 100755 --- a/media/java/android/media/videoeditor/MediaImageItem.java +++ b/media/java/android/media/videoeditor/MediaImageItem.java @@ -197,7 +197,6 @@ public class MediaImageItem extends MediaItem { fl.close(); } imageBitmap.recycle(); - System.gc(); } /* |