From 3b703f2d11f20efaa953ad31d6c97fe3561efb03 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@google.com>
Date: Mon, 10 Jan 2011 16:33:48 -0800
Subject: [PATCH] Hide Canvas.getGL()

Change-Id: I6d81cf9f43ce0c990fe30b3b3159c95ac738ae79
---
 api/current.xml                            | 11 -----------
 graphics/java/android/graphics/Canvas.java | 10 ++++++++--
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/api/current.xml b/api/current.xml
index 01a401b40bb53..83a7e0d34f61a 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -78255,17 +78255,6 @@
  visibility="public"
 >
 </method>
-<method name="getGL"
- return="javax.microedition.khronos.opengles.GL"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="deprecated"
- visibility="protected"
->
-</method>
 <method name="getHeight"
  return="int"
  abstract="false"
diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java
index 66c6d8191324a..184620b34cc03 100644
--- a/graphics/java/android/graphics/Canvas.java
+++ b/graphics/java/android/graphics/Canvas.java
@@ -85,8 +85,12 @@ public class Canvas {
 
         @Override
         protected void finalize() throws Throwable {
-            if (mNativeCanvas != 0) {
-                finalizer(mNativeCanvas);
+            try {
+                if (mNativeCanvas != 0) {
+                    finalizer(mNativeCanvas);
+                }
+            } finally {
+                super.finalize();
             }
         }
     }
@@ -137,6 +141,8 @@ public class Canvas {
      * Returns null.
      * 
      * @deprecated This method is not supported and should not be invoked.
+     * 
+     * @hide
      */
     @Deprecated
     protected GL getGL() {