Merge "Remove dependency on InflaterInputStream.closed field." (6565aae0) · Commits · e / os / android_frameworks_base

core/java/android/util/jar/StrictJarFile.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -390,6 +390,7 @@ public final class StrictJarFile {
		public static class ZipInflaterInputStream extends InflaterInputStream {
		private final ZipEntry entry;
		private long bytesRead = 0;
		private boolean closed;

		public ZipInflaterInputStream(InputStream is, Inflater inf, int bsize, ZipEntry entry) {
		super(is, inf, bsize);
		@@ -424,6 +425,12 @@ public final class StrictJarFile {
		}
		return super.available() == 0 ? 0 : (int) (entry.getSize() - bytesRead);
		}

		@Override
		public void close() throws IOException {
		super.close();
		closed = true;
		}
		}

		/**