Fix linter warnings

am: 1337c0de69

Change-Id: Ia1ea38086fe0c9899d6254a25c4715b8b1df9aff

4 files changed, 24 insertions, 18 deletions

diff --git a/src/main/java/com/android/apksig/internal/apk/AndroidBinXmlParser.java b/src/main/java/com/android/apksig/internal/apk/AndroidBinXmlParser.java
index 9113606..bc5a457 100644
--- a/src/main/java/com/android/apksig/internal/apk/AndroidBinXmlParser.java
+++ b/src/main/java/com/android/apksig/internal/apk/AndroidBinXmlParser.java
@@ -361,6 +361,9 @@ public class AndroidBinXmlParser {
                     }
                     mResourceMap = new ResourceMap(chunk);
                     break;
+                default:
+                    // Unknown chunk type -- ignore
+                    break;
             }
         }
 
diff --git a/src/main/java/com/android/apksig/internal/apk/v2/V2SchemeSigner.java b/src/main/java/com/android/apksig/internal/apk/v2/V2SchemeSigner.java
index 8ea6082..0e829c1 100644
--- a/src/main/java/com/android/apksig/internal/apk/v2/V2SchemeSigner.java
+++ b/src/main/java/com/android/apksig/internal/apk/v2/V2SchemeSigner.java
@@ -441,10 +441,10 @@ public abstract class V2SchemeSigner {
 
         ByteBuffer result = ByteBuffer.allocate(resultSize);
         result.order(ByteOrder.LITTLE_ENDIAN);
-        long blockSizeFieldValue = resultSize - 8;
+        long blockSizeFieldValue = resultSize - 8L;
         result.putLong(blockSizeFieldValue);
 
-        long pairSizeFieldValue = 4 + apkSignatureSchemeV2Block.length;
+        long pairSizeFieldValue = 4L + apkSignatureSchemeV2Block.length;
         result.putLong(pairSizeFieldValue);
         result.putInt(APK_SIGNATURE_SCHEME_V2_BLOCK_ID);
         result.put(apkSignatureSchemeV2Block);
diff --git a/src/test/java/com/android/apksig/internal/util/ChainedDataSourceTest.java b/src/test/java/com/android/apksig/internal/util/ChainedDataSourceTest.java
index 8a76388..f719a8a 100644
--- a/src/test/java/com/android/apksig/internal/util/ChainedDataSourceTest.java
+++ b/src/test/java/com/android/apksig/internal/util/ChainedDataSourceTest.java
@@ -16,6 +16,10 @@
 
 package com.android.apksig.internal.util;
 
+import static java.nio.charset.StandardCharsets.US_ASCII;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import com.android.apksig.util.DataSources;
 import com.android.apksig.util.DataSinks;
 import com.android.apksig.util.ReadableDataSink;
@@ -27,8 +31,6 @@ import org.junit.runners.JUnit4;
 
 import java.nio.ByteBuffer;
 
-import static org.junit.Assert.*;
-
 /** Unit tests for {@link ChainedDataSource}. */
 @RunWith(JUnit4.class)
 public final class ChainedDataSourceTest {
@@ -37,11 +39,11 @@ public final class ChainedDataSourceTest {
 
     @Before public void setUp() {
         mChain = new ChainedDataSource(
-                DataSources.asDataSource(ByteBuffer.wrap("12".getBytes())),
-                DataSources.asDataSource(ByteBuffer.wrap("34567".getBytes())),
-                DataSources.asDataSource(ByteBuffer.wrap("".getBytes())),
-                DataSources.asDataSource(ByteBuffer.wrap("890".getBytes())),
-                DataSources.asDataSource(ByteBuffer.wrap("".getBytes())));
+                DataSources.asDataSource(ByteBuffer.wrap("12".getBytes(US_ASCII))),
+                DataSources.asDataSource(ByteBuffer.wrap("34567".getBytes(US_ASCII))),
+                DataSources.asDataSource(ByteBuffer.wrap("".getBytes(US_ASCII))),
+                DataSources.asDataSource(ByteBuffer.wrap("890".getBytes(US_ASCII))),
+                DataSources.asDataSource(ByteBuffer.wrap("".getBytes(US_ASCII))));
         assertEquals(10, mChain.size());
     }
 
@@ -52,7 +54,7 @@ public final class ChainedDataSourceTest {
                 ReadableDataSink sink = DataSinks.newInMemoryDataSink(size);
                 mChain.feed(begin, size, sink);
                 assertByteBufferEquals(
-                        ByteBuffer.wrap("1234567890".substring(begin, end).getBytes()),
+                        ByteBuffer.wrap("1234567890".substring(begin, end).getBytes(US_ASCII)),
                         sink.getByteBuffer(0, size));
             }
         }
@@ -69,7 +71,7 @@ public final class ChainedDataSourceTest {
                 int size = end - begin;
                 ByteBuffer buffer = mChain.getByteBuffer(begin, size);
                 assertByteBufferEquals(
-                        ByteBuffer.wrap("1234567890".substring(begin, end).getBytes()),
+                        ByteBuffer.wrap("1234567890".substring(begin, end).getBytes(US_ASCII)),
                         buffer);
             }
         }
@@ -91,7 +93,7 @@ public final class ChainedDataSourceTest {
 
                 buffer.rewind();
                 assertByteBufferEquals(
-                        ByteBuffer.wrap("1234567890".substring(begin, end).getBytes()),
+                        ByteBuffer.wrap("1234567890".substring(begin, end).getBytes(US_ASCII)),
                         buffer);
             }
         }
@@ -105,7 +107,7 @@ public final class ChainedDataSourceTest {
                 ByteBuffer buffer = mChain.slice(begin, size).getByteBuffer(0, size);
 
                 assertByteBufferEquals(
-                        ByteBuffer.wrap("1234567890".substring(begin, end).getBytes()),
+                        ByteBuffer.wrap("1234567890".substring(begin, end).getBytes(US_ASCII)),
                         buffer);
             }
         }
diff --git a/src/test/java/com/android/apksig/internal/util/VerityTreeBuilderTest.java b/src/test/java/com/android/apksig/internal/util/VerityTreeBuilderTest.java
index 568d045..a10b259 100644
--- a/src/test/java/com/android/apksig/internal/util/VerityTreeBuilderTest.java
+++ b/src/test/java/com/android/apksig/internal/util/VerityTreeBuilderTest.java
@@ -16,6 +16,11 @@
 
 package com.android.apksig.internal.util;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.fail;
+
 import com.android.apksig.util.DataSource;
 import com.android.apksig.util.DataSources;
 
@@ -27,10 +32,6 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.security.NoSuchAlgorithmException;
 
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertNotNull;
-import static junit.framework.TestCase.fail;
-
 
 /** Unit tests for {@link VerityTreeBuilder}. */
 @RunWith(JUnit4.class)
@@ -76,7 +77,7 @@ public final class VerityTreeBuilderTest {
     }
 
     private DataSource makeStringDataSource(String data) {
-        return DataSources.asDataSource(ByteBuffer.wrap(data.getBytes()));
+        return DataSources.asDataSource(ByteBuffer.wrap(data.getBytes(UTF_8)));
     }
 
     @Test public void generateVerityTreeRootHashFromDummyDataSource() throws Exception {