Merge "MTP: Add try/finally handling to finalize overrides"

media/java/android/media/MtpClient.java

@@ -41,8 +41,12 @@ public class MtpClient {
     }
 
     @Override
-    protected void finalize() {
-        native_finalize();
+    protected void finalize() throws Throwable {
+        try {
+            native_finalize();
+        } finally {
+            super.finalize();
+        }
     }
 
     public boolean start() {

media/java/android/media/MtpCursor.java

@@ -97,7 +97,11 @@ public final class MtpCursor extends AbstractWindowedCursor {
 
     @Override
     protected void finalize() {
-        native_finalize();
+        try {
+            native_finalize();
+        } finally {
+            super.finalize();
+        }
     }
 
     @Override

media/java/android/media/MtpDatabase.java

@@ -86,8 +86,13 @@ public class MtpDatabase {
     }
 
     @Override
-    protected void finalize() {
-        native_finalize();
+    protected void finalize() throws Throwable {
+        try {
+            native_finalize();
+            mDevicePropDb.close();
+        } finally {
+            super.finalize();
+        }
     }
 
     private int beginSendObject(String path, int format, int parent,

media/java/android/media/MtpServer.java

@@ -35,8 +35,12 @@ public class MtpServer {
     }
 
     @Override
-    protected void finalize() {
-        native_finalize();
+    protected void finalize() throws Throwable {
+        try {
+            native_finalize();
+        } finally {
+            super.finalize();
+        }
     }
 
     public void start() {