Use WeakReferenes to reduce Bitmap memory footprint

Use HashMap<Integer, WeakReference<Drawable>> instead of just
    HashMap<Integer, Drawable>

Without this, references are still being held for Bitmap drawables,
thereby after few Photo edits, OutOfMemoryException is raised and
Gallery crashes

Change-Id: If91f950986bd816d5571a0d51a7cb9522226e270

1 files changed, 4 insertions, 3 deletions

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
index a7286f0fa..0f9e7b999 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
@@ -25,6 +25,7 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 
 import java.util.HashMap;
+import java.lang.ref.WeakReference;
 
 public class ImageFilterBorder extends ImageFilter {
     private static final float NINEPATCH_ICON_SCALING = 10;
@@ -32,7 +33,7 @@ public class ImageFilterBorder extends ImageFilter {
     private FilterImageBorderRepresentation mParameters = null;
     private Resources mResources = null;
 
-    private HashMap<Integer, Drawable> mDrawables = new HashMap<Integer, Drawable>();
+    private HashMap<Integer, WeakReference<Drawable>> mDrawables = new HashMap<Integer, WeakReference<Drawable>>();
 
     public ImageFilterBorder() {
         mName = "Border";
@@ -81,10 +82,10 @@ public class ImageFilterBorder extends ImageFilter {
     }
 
     public Drawable getDrawable(int rsc) {
-        Drawable drawable = mDrawables.get(rsc);
+        Drawable drawable = (mDrawables.get(rsc) != null) ? mDrawables.get(rsc).get() : null;
         if (drawable == null && mResources != null && rsc != 0) {
             drawable = new BitmapDrawable(mResources, BitmapFactory.decodeResource(mResources, rsc));
-            mDrawables.put(rsc, drawable);
+            mDrawables.put(rsc, new WeakReference<Drawable>(drawable));
         }
         return drawable;
     }