Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make dumpHexString() tolerate null arrays."

Browse Source
This commit is contained in:
Treehugger Robot
2018-06-15 02:32:54 +00:00
committed by Gerrit Code Review
parent 31686e954a dee4e0bde4
commit a917c1db32
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/util/HexDump.java
View File

@@ -16,18 +16,21 @@
package com.android.internal.util; package com.android.internal.util;
import android.annotation.Nullable;
public class HexDump public class HexDump
{ {
private final static char[] HEX_DIGITS = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' }; private final static char[] HEX_DIGITS = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
private final static char[] HEX_LOWER_CASE_DIGITS = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; private final static char[] HEX_LOWER_CASE_DIGITS = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
public static String dumpHexString(byte[] array) public static String dumpHexString(@Nullable byte[] array) {
{ if (array == null) return "(null)";
return dumpHexString(array, 0, array.length); return dumpHexString(array, 0, array.length);
} }
public static String dumpHexString(byte[] array, int offset, int length) public static String dumpHexString(@Nullable byte[] array, int offset, int length)
{ {
if (array == null) return "(null)";
StringBuilder result = new StringBuilder(); StringBuilder result = new StringBuilder();
byte[] line = new byte[16]; byte[] line = new byte[16];

3
core/tests/coretests/src/com/android/internal/util/HexDumpTest.java
View File

@@ -25,4 +25,7 @@ public final class HexDumpTest extends TestCase {
assertEquals("ABCDEF", HexDump.toHexString( assertEquals("ABCDEF", HexDump.toHexString(
new byte[] { (byte) 0xab, (byte) 0xcd, (byte) 0xef }, true)); new byte[] { (byte) 0xab, (byte) 0xcd, (byte) 0xef }, true));
} }
public void testNullArray() {
assertEquals("(null)", HexDump.toHexString(null));
}
} }