summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Craik <ccraik@android.com>2015-04-20 17:15:50 (GMT)
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-20 17:15:50 (GMT)
commit33d22e9689027fbcc8b9cd5c7db5787853ba546d (patch)
tree861274a33a9e015ced9ee32a126a76643f41a9d3
parentc9c41794b77da22576e42fb85336a034a1d570ec (diff)
parent47098ae3d7bcf54e180b381327fdc0f3175b286a (diff)
downloadandroid_frameworks_ex-33d22e9689027fbcc8b9cd5c7db5787853ba546d.zip
android_frameworks_ex-33d22e9689027fbcc8b9cd5c7db5787853ba546d.tar.gz
android_frameworks_ex-33d22e9689027fbcc8b9cd5c7db5787853ba546d.tar.bz2
am 47098ae3: am 33817eae: Merge "Simplify destruction path - require users to call destroy()"
* commit '47098ae3d7bcf54e180b381327fdc0f3175b286a': 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) {}
};
/**