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

am: f952f52013 Change-Id: I0a621a83670f326d218fe3f77bc5fe9bbad6ea6c
2016-08-09 11:02:07 +00:00
parent 1c47ebcf84 f952f52013
commit ce78eb6b45
1 changed files with 12 additions and 0 deletions
--- 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(),