Merge "Don't crash on Canvas.drawPicture()"

core/java/android/view/GLES20Canvas.java

@@ -908,17 +908,17 @@ class GLES20Canvas extends HardwareCanvas {
 
     @Override
     public void drawPicture(Picture picture) {
-        throw new UnsupportedOperationException();
+        // TODO: Implement
     }
 
     @Override
     public void drawPicture(Picture picture, Rect dst) {
-        throw new UnsupportedOperationException();
+        // TODO: Implement
     }
 
     @Override
     public void drawPicture(Picture picture, RectF dst) {
-        throw new UnsupportedOperationException();
+        // TODO: Implement
     }
 
     @Override

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() {