summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorSantosh Madhava <smadhava@google.com>2011-02-22 20:19:38 -0800
committerSantosh Madhava <smadhava@google.com>2011-02-22 20:19:38 -0800
commit3f48207ea4592ec0897f2043b2042a7114f8487d (patch)
tree99efa50dd00ab276495979bf8d52f8f7296a66dc /media
parent3b36ff48f1d64022366b180c75fa9ef9d034f9e8 (diff)
downloadframeworks_base-3f48207ea4592ec0897f2043b2042a7114f8487d.zip
frameworks_base-3f48207ea4592ec0897f2043b2042a7114f8487d.tar.gz
frameworks_base-3f48207ea4592ec0897f2043b2042a7114f8487d.tar.bz2
Cleanup for issue 3471160 : video editor calls System.gc
Change-Id: I8cdebde25a45767a1c1b9b6c2c59b7e65cacc0bd
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/videoeditor/MediaArtistNativeHelper.java1
-rwxr-xr-xmedia/java/android/media/videoeditor/MediaImageItem.java1
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();
}
/*