diff options
| author | Uday Kiran jandhyala <ukiran@codeaurora.org> | 2014-05-21 18:03:12 +0530 |
|---|---|---|
| committer | LorDClockaN <davor@losinj.com> | 2014-09-04 21:56:50 +0200 |
| commit | 83bd48bf07b4e5f17ab31afabf9105dfa1a199b8 (patch) | |
| tree | 40c997540043ca5b389487e83ea9b0b8fe6f5d7a | |
| parent | abe93bf70efa4db7c1bb3dd40c269c17938908cf (diff) | |
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
Conflicts:
src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
Change-Id: If91f950986bd816d5571a0d51a7cb9522226e270
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java | 7 |
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 a7bd539f..5f350227 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java @@ -26,6 +26,7 @@ import android.graphics.drawable.Drawable; import com.android.gallery3d.data.DecodeUtils; import java.util.HashMap; +import java.lang.ref.WeakReference; public class ImageFilterBorder extends ImageFilter { private static final float NINEPATCH_ICON_SCALING = 10; @@ -33,7 +34,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"; @@ -82,11 +83,11 @@ public class ImageFilterBorder extends ImageFilter { } public Drawable getDrawable(int rsc, int reqWidth, int reqHeight) { - 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, DecodeUtils.decodeBitmap( mResources, rsc, reqWidth, reqHeight)); - mDrawables.put(rsc, drawable); + mDrawables.put(rsc, new WeakReference<Drawable>(drawable)); } return drawable; } |