diff options
| author | Chris Craik <ccraik@android.com> | 2015-02-24 00:39:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-24 00:39:50 +0000 |
| commit | 46ca918db82c1fca3f370ec6a9b936bf7268aa85 (patch) | |
| tree | 86c96f06c1e225c8e23a5858b60c423cc89b872a /framesequence/src/android/support/rastermill/FrameSequenceDrawable.java | |
| parent | f924719d491c2b1a1c42234a0a174d975691b483 (diff) | |
| parent | 482fc563fa9783cce1dee882e8d4cd4d2d92b1c6 (diff) | |
| download | android_frameworks_ex-46ca918db82c1fca3f370ec6a9b936bf7268aa85.tar.gz android_frameworks_ex-46ca918db82c1fca3f370ec6a9b936bf7268aa85.tar.bz2 android_frameworks_ex-46ca918db82c1fca3f370ec6a9b936bf7268aa85.zip | |
am 482fc563: Merge "Make WebP in FrameSequence optional"
* commit '482fc563fa9783cce1dee882e8d4cd4d2d92b1c6':
Make WebP in FrameSequence optional
Diffstat (limited to 'framesequence/src/android/support/rastermill/FrameSequenceDrawable.java')
| -rw-r--r-- | framesequence/src/android/support/rastermill/FrameSequenceDrawable.java | 3 |
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(); } |