Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 4527 into donut

Browse Source 
* changes:
  Fix Canvas.finalize() for the case where the constructor throws an exception before the native canvas instance was created.
This commit is contained in:
Android (Google) Code Review
2009-06-19 10:07:29 -07:00
parent 649f99e834 4566b79736
commit 2b1aed1021
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/java/android/graphics/Canvas.java
View File

@@ -1404,8 +1404,12 @@ public class Canvas {
protected void finalize() throws Throwable { protected void finalize() throws Throwable {
super.finalize(); super.finalize();
// If the constructor threw an exception before setting mNativeCanvas, the native finalizer
// must not be invoked.
if (mNativeCanvas != 0) {
finalizer(mNativeCanvas); finalizer(mNativeCanvas);
} }
}
/** /**
* Free up as much memory as possible from private caches (e.g. fonts, * Free up as much memory as possible from private caches (e.g. fonts,