4 files changed, 24 insertions, 7 deletions
diff --git a/media/java/android/media/MtpClient.java b/media/java/android/media/MtpClient.java
index 1aebcb82c98b..f7c0ce2657ce 100644
--- a/media/java/android/media/MtpClient.java
+++ b/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() {
diff --git a/media/java/android/media/MtpCursor.java b/media/java/android/media/MtpCursor.java
index 6ecfd0df4dcf..d4142d8610b8 100644
--- a/media/java/android/media/MtpCursor.java
+++ b/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
diff --git a/media/java/android/media/MtpDatabase.java b/media/java/android/media/MtpDatabase.java
index 7e0d390362c3..1ea7e91944c9 100644
--- a/media/java/android/media/MtpDatabase.java
+++ b/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,
diff --git a/media/java/android/media/MtpServer.java b/media/java/android/media/MtpServer.java
index b0945a5a7373..dcf08e2874fb 100644
--- a/media/java/android/media/MtpServer.java
+++ b/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() {