diff options
author | Conley Owens <cco3@android.com> | 2011-04-29 10:00:00 -0700 |
---|---|---|
committer | Android Code Review <code-review@android.com> | 2011-04-29 10:00:00 -0700 |
commit | 9fd8e0579fb3306f61ba1716b1977562ae3626e1 (patch) | |
tree | 1e556783aee6f3a4b5e5d898128d46c05494ae1e /graphics | |
parent | 8ebf35589dd2bee84ad93613df21666b8858a10f (diff) | |
parent | 08d7778f081aae745e6ad9e5350221b21dbf352e (diff) | |
download | frameworks_base-9fd8e0579fb3306f61ba1716b1977562ae3626e1.zip frameworks_base-9fd8e0579fb3306f61ba1716b1977562ae3626e1.tar.gz frameworks_base-9fd8e0579fb3306f61ba1716b1977562ae3626e1.tar.bz2 |
Merge "Fix memory leak of SkMovie class"
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/java/android/graphics/Movie.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/Movie.java b/graphics/java/android/graphics/Movie.java index 95e9946..4a33453 100644 --- a/graphics/java/android/graphics/Movie.java +++ b/graphics/java/android/graphics/Movie.java @@ -46,6 +46,8 @@ public class Movie { public static native Movie decodeByteArray(byte[] data, int offset, int length); + private static native void nativeDestructor(int nativeMovie); + public static Movie decodeFile(String pathName) { InputStream is; try { @@ -57,6 +59,15 @@ public class Movie { return decodeTempStream(is); } + @Override + protected void finalize() throws Throwable { + try { + nativeDestructor(mNativeMovie); + } finally { + super.finalize(); + } + } + private static Movie decodeTempStream(InputStream is) { Movie moov = null; try { |