Merge "Merge "ZipUtils: use FileChannel#size" am: d0798d7117 am: f92201554a... (829e0f5c) · Commits · e / os / android_frameworks_base

core/java/android/util/apk/ZipUtils.java

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -63,7 +63,8 @@ abstract class ZipUtils {
	// exactly the remaining bytes in the buffer. The search is bounded because the maximum		// exactly the remaining bytes in the buffer. The search is bounded because the maximum
	// size of the comment field is 65535 bytes because the field is an unsigned 16-bit number.		// size of the comment field is 65535 bytes because the field is an unsigned 16-bit number.

	long fileSize = zip.length();		// TODO(b/193592496) RandomAccessFile#length
			long fileSize = zip.getChannel().size();
	if (fileSize < ZIP_EOCD_REC_MIN_SIZE) {		if (fileSize < ZIP_EOCD_REC_MIN_SIZE) {
	return null;		return null;
	}		}
	@@ -110,7 +111,8 @@ abstract class ZipUtils {
	throw new IllegalArgumentException("maxCommentSize: " + maxCommentSize);		throw new IllegalArgumentException("maxCommentSize: " + maxCommentSize);
	}		}

	long fileSize = zip.length();		// TODO(b/193592496) RandomAccessFile#length
			long fileSize = zip.getChannel().size();
	if (fileSize < ZIP_EOCD_REC_MIN_SIZE) {		if (fileSize < ZIP_EOCD_REC_MIN_SIZE) {
	// No space for EoCD record in the file.		// No space for EoCD record in the file.
	return null;		return null;