summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2015-01-29 23:30:07 (GMT)
committerChris Craik <ccraik@google.com>2015-01-29 23:38:14 (GMT)
commitb19ecfd9cfa2c417034403adf7039edf9fe59327 (patch)
tree89f5bee9ba39025bea0f73353b047816a4d87f78
parent6765631b2eac9978b7ca2b7f8ef0dd6b53808d10 (diff)
downloadandroid_frameworks_ex-b19ecfd9cfa2c417034403adf7039edf9fe59327.zip
android_frameworks_ex-b19ecfd9cfa2c417034403adf7039edf9fe59327.tar.gz
android_frameworks_ex-b19ecfd9cfa2c417034403adf7039edf9fe59327.tar.bz2
Simplify destruction path - require users to call destroy()
bug:19035637 Change-Id: I1efbd8682977dd58c8c454b8253bfa82f6534ff5
-rw-r--r--framesequence/src/android/support/rastermill/FrameSequenceDrawable.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/framesequence/src/android/support/rastermill/FrameSequenceDrawable.java b/framesequence/src/android/support/rastermill/FrameSequenceDrawable.java
index cda0cfe..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) {}
};
/**
@@ -270,9 +268,6 @@ public class FrameSequenceDrawable extends Drawable implements Animatable, Runna
protected void finalize() throws Throwable {
try {
mFrameSequenceState.destroy();
- if (!mDestroyed) {
- destroy();
- }
} finally {
super.finalize();
}