Merge "Expand SecurityManager javadoc with info about its support." into oc-dev
diff --git a/luni/src/test/java/libcore/java/nio/channels/DatagramChannelMulticastTest.java b/luni/src/test/java/libcore/java/nio/channels/DatagramChannelMulticastTest.java
index ae044b4..9b04092 100644
--- a/luni/src/test/java/libcore/java/nio/channels/DatagramChannelMulticastTest.java
+++ b/luni/src/test/java/libcore/java/nio/channels/DatagramChannelMulticastTest.java
@@ -1009,7 +1009,7 @@
GOOD_MULTICAST_IPv4 /* receiverBindAddress */,
GOOD_MULTICAST_IPv4 /* groupAddress */,
UNICAST_IPv4_1 /* badSenderAddress */,
- ipv6NetworkInterface);
+ ipv4NetworkInterface);
}
/**
@@ -1064,6 +1064,7 @@
* @param receiverBindAddress the address to bind the receiver socket to
* @param groupAddress the group address to join
* @param badSenderAddress a unicast address to join to perform a negative test
+ * @param networkInterface The network interface on which to join the multicast group
*/
private void test_joinSourceSpecific(
InetAddress senderBindAddress, InetAddress receiverBindAddress, InetAddress groupAddress,
diff --git a/ojluni/src/test/java/time/tck/java/time/format/TCKLocalizedPrinterParser.java b/ojluni/src/test/java/time/tck/java/time/format/TCKLocalizedPrinterParser.java
index 27c0575..36c3e51 100644
--- a/ojluni/src/test/java/time/tck/java/time/format/TCKLocalizedPrinterParser.java
+++ b/ojluni/src/test/java/time/tck/java/time/format/TCKLocalizedPrinterParser.java
@@ -72,6 +72,7 @@
import java.util.Date;
import java.util.Locale;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -82,6 +83,21 @@
@Test
public class TCKLocalizedPrinterParser {
+ // BEGIN Android-added: Clear DateFormat.is24Hour during test run (http://b/62651881).
+ private Boolean originalIs24Hour;
+
+ @BeforeMethod
+ public void clearIs24Hour() {
+ originalIs24Hour = DateFormat.is24Hour;
+ DateFormat.set24HourTimePref(null);
+ }
+
+ @AfterMethod
+ public void resetIs24Hour() {
+ DateFormat.set24HourTimePref(originalIs24Hour);
+ }
+ // END Android-added: Clear DateFormat.is24Hour during test run (http://b/62651881).
+
private DateTimeFormatterBuilder builder;
private ParsePosition pos;