summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Craik <ccraik@android.com>2015-04-20 17:07:49 (GMT)
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-20 17:07:49 (GMT)
commit47098ae3d7bcf54e180b381327fdc0f3175b286a (patch)
treed6f68227e00bc7eb82af0fccdc1dc86c4dc54811
parent315c8a384c4ca2a5670b9eed407caa5dea6c1ce0 (diff)
parent33817eaefa27af45f0e25358ff36a09a4843aab8 (diff)
downloadandroid_frameworks_ex-47098ae3d7bcf54e180b381327fdc0f3175b286a.zip
android_frameworks_ex-47098ae3d7bcf54e180b381327fdc0f3175b286a.tar.gz
android_frameworks_ex-47098ae3d7bcf54e180b381327fdc0f3175b286a.tar.bz2
am 33817eae: Merge "Simplify destruction path - require users to call destroy()"
* commit '33817eaefa27af45f0e25358ff36a09a4843aab8': Simplify destruction path - require users to call destroy()
-rw-r--r--framesequence/src/android/support/rastermill/FrameSequenceDrawable.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/framesequence/src/android/support/rastermill/FrameSequenceDrawable.java b/framesequence/src/android/support/rastermill/FrameSequenceDrawable.java
index 351b8a3..af25c82 100644
--- a/framesequence/src/android/support/rastermill/FrameSequenceDrawable.java
+++ b/framesequence/src/android/support/rastermill/FrameSequenceDrawable.java
@@ -76,9 +76,7 @@ public class FrameSequenceDrawable extends Drawable implements Animatable, Runna
}
@Override
- public void releaseBitmap(Bitmap bitmap) {
- bitmap.recycle();
- }
+ public void releaseBitmap(Bitmap bitmap) {}
};
/**