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

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

+7 −0

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

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

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

	/**		/**