diff options
| author | Paulo Casanova <pasc@google.com> | 2018-01-25 23:06:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-25 23:06:30 +0000 |
| commit | 59cbda43e9a5fa138e092a5fb705145e2f94a89b (patch) | |
| tree | f8abcd03f20190004d3c4408ad753571288545b4 | |
| parent | 6140474a493487880fe71f765cf725eb66139121 (diff) | |
| parent | 0dd9c5db25104b40394948daa1f6d7a34373ce1f (diff) | |
| download | apkzlib-59cbda43e9a5fa138e092a5fb705145e2f94a89b.tar.gz | |
Minor fixes in apkzlib to remove warnings in G3. am: c7e7e17484
am: 0dd9c5db25
Change-Id: I412604d961676fb8b36859aa21f88ad4a65dd578
| -rw-r--r-- | src/main/java/com/android/apkzlib/zip/Eocd.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/android/apkzlib/zip/StoredEntry.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/android/apkzlib/zip/ZFile.java | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/com/android/apkzlib/zip/Eocd.java b/src/main/java/com/android/apkzlib/zip/Eocd.java index 665f0a8..1568840 100644 --- a/src/main/java/com/android/apkzlib/zip/Eocd.java +++ b/src/main/java/com/android/apkzlib/zip/Eocd.java @@ -215,7 +215,7 @@ class Eocd { * @return the size, in bytes, of the EOCD */ long getEocdSize() { - return F_COMMENT_SIZE.endOffset() + comment.length; + return (long) F_COMMENT_SIZE.endOffset() + comment.length; } /** diff --git a/src/main/java/com/android/apkzlib/zip/StoredEntry.java b/src/main/java/com/android/apkzlib/zip/StoredEntry.java index 5693fce..94aa01a 100644 --- a/src/main/java/com/android/apkzlib/zip/StoredEntry.java +++ b/src/main/java/com/android/apkzlib/zip/StoredEntry.java @@ -499,7 +499,7 @@ public class StoredEntry { long ddStart = cdh.getOffset() + FIXED_LOCAL_FILE_HEADER_SIZE + cdh.getName().length() + localExtra.size() + compressInfo.getCompressedSize(); - byte ddData[] = new byte[DataDescriptorType.DATA_DESCRIPTOR_WITH_SIGNATURE.size]; + byte[] ddData = new byte[DataDescriptorType.DATA_DESCRIPTOR_WITH_SIGNATURE.size]; file.directFullyRead(ddStart, ddData); ByteBuffer ddBytes = ByteBuffer.wrap(ddData); diff --git a/src/main/java/com/android/apkzlib/zip/ZFile.java b/src/main/java/com/android/apkzlib/zip/ZFile.java index 6eb2691..8a88cd0 100644 --- a/src/main/java/com/android/apkzlib/zip/ZFile.java +++ b/src/main/java/com/android/apkzlib/zip/ZFile.java @@ -351,8 +351,8 @@ public class ZFile implements Closeable { private final List<IOExceptionRunnable> toRun; /** - * {@code true} when {@link #notify(com.android.apkzlib.utils.IOExceptionFunction)} is notifying extensions. Used - * to avoid reordering notifications. + * {@code true} when {@link #notify(com.android.apkzlib.utils.IOExceptionFunction)} is + * notifying extensions. Used to avoid reordering notifications. */ private boolean isNotifying; @@ -2491,7 +2491,7 @@ public class ZFile implements Closeable { // We found a possible EOCD signature at position i. Try to read it. ByteBuffer bytes = ByteBuffer.wrap(comment, i, comment.length - i); try { - Eocd eocdInComment = new Eocd(bytes); + new Eocd(bytes); throw new IllegalArgumentException( "Position " + i |