diff options
| author | Romain Guy <romainguy@google.com> | 2012-01-18 18:12:51 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-18 18:12:51 -0800 |
| commit | 205c2c5fb14d8415c59762b2f71385f99ab11b4b (patch) | |
| tree | b007a1c45c103ca56aebadcd470bc3fe7f7e6608 /graphics/java | |
| parent | d79c3fbe594f657d811fe31714edaea56187a4cf (diff) | |
| parent | e7bdf2d9d0107afadddb6498331cd21be260d23c (diff) | |
| download | frameworks_base-205c2c5fb14d8415c59762b2f71385f99ab11b4b.zip frameworks_base-205c2c5fb14d8415c59762b2f71385f99ab11b4b.tar.gz frameworks_base-205c2c5fb14d8415c59762b2f71385f99ab11b4b.tar.bz2 | |
am e7bdf2d9: Merge "Don\'t crash on Canvas.drawPicture()"
* commit 'e7bdf2d9d0107afadddb6498331cd21be260d23c':
Don't crash on Canvas.drawPicture()
Diffstat (limited to 'graphics/java')
| -rw-r--r-- | graphics/java/android/graphics/Picture.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/Picture.java b/graphics/java/android/graphics/Picture.java index bbb2dbf..9c06fed 100644 --- a/graphics/java/android/graphics/Picture.java +++ b/graphics/java/android/graphics/Picture.java @@ -123,7 +123,11 @@ public class Picture { } protected void finalize() throws Throwable { - nativeDestructor(mNativePicture); + try { + nativeDestructor(mNativePicture); + } finally { + super.finalize(); + } } /*package*/ final int ni() { |