Merge "Fix crashing StrictJarFile due to doubled closing."

am: 68ea36243d Change-Id: I40c0c1387c2492c8ce4eec2623f25b2f041c13ec
2016-12-07 01:50:08 +00:00
parent ea968e411c 68ea36243d
commit 15cd392108
1 changed files with 1 additions and 0 deletions
--- a/core/java/android/util/jar/StrictJarFile.java
+++ b/core/java/android/util/jar/StrictJarFile.java
@@ -134,6 +134,7 @@ public final class StrictJarFile {
        } catch (IOException | SecurityException e) {
            nativeClose(this.nativeHandle);
            IoUtils.closeQuietly(fd);
+            closed = true;
            throw e;
        }