diff options
| author | Bobby Georgescu <georgescu@google.com> | 2013-02-22 21:03:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-22 21:03:46 +0000 |
| commit | fae7bf8557f7de818a768d7a8c30425a9a5641d8 (patch) | |
| tree | 341bb1cf1c6fd0f65da4b528abe35e4c56441a96 /src/com/android/gallery3d/app/AbstractGalleryActivity.java | |
| parent | ea332c69f084322ebdd13419424ee5fab2351760 (diff) | |
| parent | f52ceba89962829aa12f5caba131580e8da85880 (diff) | |
| download | android_packages_apps_Gallery2-fae7bf8557f7de818a768d7a8c30425a9a5641d8.tar.gz android_packages_apps_Gallery2-fae7bf8557f7de818a768d7a8c30425a9a5641d8.tar.bz2 android_packages_apps_Gallery2-fae7bf8557f7de818a768d7a8c30425a9a5641d8.zip | |
Merge "Replace various BitmapPools with a smarter unified pool" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/gallery3d/app/AbstractGalleryActivity.java')
| -rw-r--r-- | src/com/android/gallery3d/app/AbstractGalleryActivity.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/com/android/gallery3d/app/AbstractGalleryActivity.java b/src/com/android/gallery3d/app/AbstractGalleryActivity.java index c9cce811a..d96094245 100644 --- a/src/com/android/gallery3d/app/AbstractGalleryActivity.java +++ b/src/com/android/gallery3d/app/AbstractGalleryActivity.java @@ -38,9 +38,9 @@ import android.view.WindowManager; import com.android.gallery3d.R; import com.android.gallery3d.common.ApiHelper; -import com.android.gallery3d.data.BitmapPool; import com.android.gallery3d.data.DataManager; import com.android.gallery3d.data.MediaItem; +import com.android.photos.data.GalleryBitmapPool; import com.android.gallery3d.ui.GLRoot; import com.android.gallery3d.ui.GLRootView; import com.android.gallery3d.util.LightCycleHelper.PanoramaViewHelper; @@ -222,16 +222,10 @@ public class AbstractGalleryActivity extends Activity implements GalleryContext } finally { mGLRootView.unlockRenderThread(); } - clearBitmapPool(MediaItem.getMicroThumbPool()); - clearBitmapPool(MediaItem.getThumbPool()); - + GalleryBitmapPool.getInstance().clear(); MediaItem.getBytesBufferPool().clear(); } - private static void clearBitmapPool(BitmapPool pool) { - if (pool != null) pool.clear(); - } - @Override protected void onDestroy() { super.onDestroy(); |