summaryrefslogtreecommitdiffstats
path: root/framesequence/src
diff options
context:
space:
mode:
authorChris Craik <ccraik@android.com>2015-02-24 00:33:51 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-02-24 00:33:51 +0000
commit482fc563fa9783cce1dee882e8d4cd4d2d92b1c6 (patch)
tree9e41a8b11b3c3d3cd449ef4eb46f51f422a6e58d /framesequence/src
parent6765631b2eac9978b7ca2b7f8ef0dd6b53808d10 (diff)
parent1dcd11c8d1b433446147c8f1bddfa277c26c918e (diff)
downloadandroid_frameworks_ex-482fc563fa9783cce1dee882e8d4cd4d2d92b1c6.tar.gz
android_frameworks_ex-482fc563fa9783cce1dee882e8d4cd4d2d92b1c6.tar.bz2
android_frameworks_ex-482fc563fa9783cce1dee882e8d4cd4d2d92b1c6.zip
Merge "Make WebP in FrameSequence optional"
Diffstat (limited to 'framesequence/src')
-rw-r--r--framesequence/src/android/support/rastermill/FrameSequenceDrawable.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/framesequence/src/android/support/rastermill/FrameSequenceDrawable.java b/framesequence/src/android/support/rastermill/FrameSequenceDrawable.java
index cda0cfe..351b8a3 100644
--- a/framesequence/src/android/support/rastermill/FrameSequenceDrawable.java
+++ b/framesequence/src/android/support/rastermill/FrameSequenceDrawable.java
@@ -270,9 +270,6 @@ public class FrameSequenceDrawable extends Drawable implements Animatable, Runna
protected void finalize() throws Throwable {
try {
mFrameSequenceState.destroy();
- if (!mDestroyed) {
- destroy();
- }
} finally {
super.finalize();
}