Merge "Only tag/untag AF_INET and AF_INET6 sockets."
diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index 209e70c..cb43851 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -182,7 +182,7 @@
LOCAL_MODULE := core-test-rules-hostdex
LOCAL_JAVA_LIBRARIES := core-oj-hostdex core-libart-hostdex
LOCAL_STATIC_JAVA_LIBRARIES := junit-hostdex
-include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
+include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(non_openjdk_java_files) $(android_icu4j_src_files)
diff --git a/luni/src/test/java/libcore/java/nio/charset/OldCharset_AbstractTest.java b/luni/src/test/java/libcore/java/nio/charset/OldCharset_AbstractTest.java
index 60c716c..4b061ed 100644
--- a/luni/src/test/java/libcore/java/nio/charset/OldCharset_AbstractTest.java
+++ b/luni/src/test/java/libcore/java/nio/charset/OldCharset_AbstractTest.java
@@ -219,7 +219,7 @@
actual = actualCB.get();
if (actual != expected) {
String detail = String.format(
- "Mismatch at index %d: %d instead of expected %d.\n",
+ "Mismatch at index %d: U+%04X instead of expected U+%04X.\n",
i, (int) actual, (int) expected);
match = false;
fail(msg + ": " + detail);
@@ -239,8 +239,9 @@
for (int i = 0; i < actualCB.length(); ++i) {
char actual = actualCB.get();
if (actual != expected[i]) {
- String detail = String.format("Mismatch at index %d: %d instead of expected %d.\n",
- i, (int) actual, (int) expected[i]);
+ String detail = String.format(
+ "Mismatch at index %d: U+%04X instead of expected U+%04X.\n",
+ i, (int) actual, (int) expected[i]);
fail(detail);
}
}
@@ -259,7 +260,7 @@
actual = actualBB.get();
if (actual != expected[i]) {
String detail = String.format(
- "Mismatch at index %d: %d instead of expected %d.\n",
+ "Mismatch at index %d: %02X instead of expected %02X.\n",
i, actual & 0xff, expected[i] & 0xff);
match = false;
fail(msg + ": " + detail);
diff --git a/luni/src/test/java/libcore/java/nio/charset/OldCharset_MultiByte_EUC_JP.java b/luni/src/test/java/libcore/java/nio/charset/OldCharset_MultiByte_EUC_JP.java
index 4849ad3..73ed1bf 100644
--- a/luni/src/test/java/libcore/java/nio/charset/OldCharset_MultiByte_EUC_JP.java
+++ b/luni/src/test/java/libcore/java/nio/charset/OldCharset_MultiByte_EUC_JP.java
@@ -15,11 +15,6 @@
*/
package libcore.java.nio.charset;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.CharacterCodingException;
-import java.nio.charset.CodingErrorAction;
-
public class OldCharset_MultiByte_EUC_JP extends OldCharset_AbstractTest {
@Override protected void setUp() throws Exception {
charsetName = "EUC-JP";
@@ -30,22 +25,4 @@
'T', 'o', 'k', 'y', 'o', ' ', '1', '2', '3');
super.setUp();
}
-
- @Override public void test_CodecDynamic() throws CharacterCodingException {
- encoder.onUnmappableCharacter(CodingErrorAction.REPORT);
- decoder.onMalformedInput(CodingErrorAction.REPORT);
- CharBuffer inputCB = CharBuffer.allocate(65536);
- for (char codePoint = 0; codePoint <= 0xfffe; ++codePoint) {
- if (encoder.canEncode(codePoint)) {
- inputCB.put(codePoint);
- }
- }
- inputCB.rewind();
- ByteBuffer intermediateBB = encoder.encode(inputCB);
- inputCB.rewind();
- intermediateBB.rewind();
- CharBuffer outputCB = decoder.decode(intermediateBB);
- outputCB.rewind();
- assertEqualCBs("decode(encode(A)) must be identical with A!", inputCB, outputCB);
- }
}
