summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tomasz Mikolajewski <mtomasz@google.com> 2016-12-07 01:50:08 +0000
committer android-build-merger <android-build-merger@google.com> 2016-12-07 01:50:08 +0000
commit15cd3921083bd54c72b4a2501329ea3a0e8574cf (patch)
treef817d6a664df4fc7040f560ff1e20664aaf97e3a
parentea968e411c855c68984551e1cfa2d5f27d35e095 (diff)
parent68ea36243df0d75bd6ab4f6c94cfba40b91ab089 (diff)
Merge "Fix crashing StrictJarFile due to doubled closing."
am: 68ea36243d Change-Id: I40c0c1387c2492c8ce4eec2623f25b2f041c13ec
-rw-r--r--core/java/android/util/jar/StrictJarFile.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/util/jar/StrictJarFile.java b/core/java/android/util/jar/StrictJarFile.java
index d9556aaaa9c0..bc4a19d2d5e9 100644
--- 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;
}