Merge "Replace various BitmapPools with a smarter unified pool" into gb-ub-photos-bryce

1 files changed, 0 insertions, 24 deletions

diff --git a/src/com/android/gallery3d/data/MediaItem.java b/src/com/android/gallery3d/data/MediaItem.java
index 19084d41e..59ea86551 100644
--- a/src/com/android/gallery3d/data/MediaItem.java
+++ b/src/com/android/gallery3d/data/MediaItem.java
@@ -42,15 +42,10 @@ public abstract class MediaItem extends MediaObject {
     private static final int BYTESBUFFER_SIZE = 200 * 1024;
 
     private static int sMicrothumbnailTargetSize = 200;
-    private static BitmapPool sMicroThumbPool;
     private static final BytesBufferPool sMicroThumbBufferPool =
             new BytesBufferPool(BYTESBUFFE_POOL_SIZE, BYTESBUFFER_SIZE);
 
     private static int sThumbnailTargetSize = 640;
-    private static final BitmapPool sThumbPool =
-            ApiHelper.HAS_REUSING_BITMAP_IN_BITMAP_FACTORY
-            ? new BitmapPool(4)
-            : null;
 
     // TODO: fix default value for latlng and change this.
     public static final double INVALID_LATLNG = 0f;
@@ -126,33 +121,14 @@ public abstract class MediaItem extends MediaObject {
         }
     }
 
-    public static BitmapPool getMicroThumbPool() {
-        if (ApiHelper.HAS_REUSING_BITMAP_IN_BITMAP_FACTORY && sMicroThumbPool == null) {
-            initializeMicroThumbPool();
-        }
-        return sMicroThumbPool;
-    }
-
-    public static BitmapPool getThumbPool() {
-        return sThumbPool;
-    }
-
     public static BytesBufferPool getBytesBufferPool() {
         return sMicroThumbBufferPool;
     }
 
-    private static void initializeMicroThumbPool() {
-        sMicroThumbPool =
-                ApiHelper.HAS_REUSING_BITMAP_IN_BITMAP_FACTORY
-                ? new BitmapPool(sMicrothumbnailTargetSize, sMicrothumbnailTargetSize, 16)
-                : null;
-    }
-
     public static void setThumbnailSizes(int size, int microSize) {
         sThumbnailTargetSize = size;
         if (sMicrothumbnailTargetSize != microSize) {
             sMicrothumbnailTargetSize = microSize;
-            initializeMicroThumbPool();
         }
     }
 }