Merge "Add a finalize() method to StrictJarFile" am: d0c0c8dcab am: 2ffb7ebae2 am: f952f52013

am: ce78eb6b45

Change-Id: Ic622fe2adabfed18a6481f8d32685e37f3fe24b0

1 files changed, 12 insertions, 0 deletions

diff --git a/core/java/android/util/jar/StrictJarFile.java b/core/java/android/util/jar/StrictJarFile.java
index 5d94b06df9fa..60e4adf1d48c 100644
--- a/core/java/android/util/jar/StrictJarFile.java
+++ b/core/java/android/util/jar/StrictJarFile.java
@@ -200,6 +200,18 @@ public final class StrictJarFile {
         }
     }
 
+    @Override
+    protected void finalize() throws Throwable {
+        try {
+            if (guard != null) {
+                guard.warnIfOpen();
+            }
+            close();
+        } finally {
+            super.finalize();
+        }
+    }
+
     private InputStream getZipInputStream(ZipEntry ze) {
         if (ze.getMethod() == ZipEntry.STORED) {
             return new RAFStream(raf, ze.getDataOffset(),