Snap for 10629485 from bcad9e1ceb53be6b0f89c97e14a2134a9179f8fd to mainline-mediaprovider-release
Change-Id: If6793805b175a5ba791f9c179d9662cf60099c98
diff --git a/api/current.txt b/api/current.txt
index a61a723..b23f9d2 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -2880,7 +2880,7 @@
}
public enum Character.UnicodeScript {
- method @NonNull public static java.lang.Character.UnicodeScript forName(@NonNull String);
+ method @NonNull public static final java.lang.Character.UnicodeScript forName(@NonNull String);
method @NonNull public static java.lang.Character.UnicodeScript of(int);
enum_constant public static final java.lang.Character.UnicodeScript ADLAM;
enum_constant public static final java.lang.Character.UnicodeScript AHOM;
@@ -12099,6 +12099,7 @@
method public static java.time.chrono.HijrahDate of(int, int, int);
method public java.time.chrono.HijrahDate plus(java.time.temporal.TemporalAmount);
method public java.time.chrono.HijrahDate plus(long, java.time.temporal.TemporalUnit);
+ method public String toString();
method public java.time.chrono.ChronoPeriod until(java.time.chrono.ChronoLocalDate);
method public long until(java.time.temporal.Temporal, java.time.temporal.TemporalUnit);
method public java.time.chrono.HijrahDate with(java.time.temporal.TemporalField, long);
@@ -12184,6 +12185,7 @@
method public static java.time.chrono.JapaneseDate of(int, int, int);
method public java.time.chrono.JapaneseDate plus(java.time.temporal.TemporalAmount);
method public java.time.chrono.JapaneseDate plus(long, java.time.temporal.TemporalUnit);
+ method public String toString();
method public java.time.chrono.ChronoPeriod until(java.time.chrono.ChronoLocalDate);
method public long until(java.time.temporal.Temporal, java.time.temporal.TemporalUnit);
method public java.time.chrono.JapaneseDate with(java.time.temporal.TemporalField, long);
@@ -12241,6 +12243,7 @@
method public static java.time.chrono.MinguoDate of(int, int, int);
method public java.time.chrono.MinguoDate plus(java.time.temporal.TemporalAmount);
method public java.time.chrono.MinguoDate plus(long, java.time.temporal.TemporalUnit);
+ method public String toString();
method public java.time.chrono.ChronoPeriod until(java.time.chrono.ChronoLocalDate);
method public long until(java.time.temporal.Temporal, java.time.temporal.TemporalUnit);
method public java.time.chrono.MinguoDate with(java.time.temporal.TemporalField, long);
@@ -12293,6 +12296,7 @@
method public static java.time.chrono.ThaiBuddhistDate of(int, int, int);
method public java.time.chrono.ThaiBuddhistDate plus(java.time.temporal.TemporalAmount);
method public java.time.chrono.ThaiBuddhistDate plus(long, java.time.temporal.TemporalUnit);
+ method public String toString();
method public java.time.chrono.ChronoPeriod until(java.time.chrono.ChronoLocalDate);
method public long until(java.time.temporal.Temporal, java.time.temporal.TemporalUnit);
method public java.time.chrono.ThaiBuddhistDate with(java.time.temporal.TemporalField, long);
diff --git a/luni/src/main/java/libcore/net/NetworkSecurityPolicy.java b/luni/src/main/java/libcore/net/NetworkSecurityPolicy.java
index aa7cde0..f161747 100644
--- a/luni/src/main/java/libcore/net/NetworkSecurityPolicy.java
+++ b/luni/src/main/java/libcore/net/NetworkSecurityPolicy.java
@@ -48,7 +48,6 @@
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
- @libcore.api.IntraCoreApi
public NetworkSecurityPolicy() {
}
diff --git a/luni/src/test/java/libcore/java/nio/channels/MembershipKeyTest.java b/luni/src/test/java/libcore/java/nio/channels/MembershipKeyTest.java
index 427789d..42c1560 100644
--- a/luni/src/test/java/libcore/java/nio/channels/MembershipKeyTest.java
+++ b/luni/src/test/java/libcore/java/nio/channels/MembershipKeyTest.java
@@ -33,24 +33,25 @@
public class MembershipKeyTest extends TestCase {
- private MembershipKey key;
- private final int PORT = 5000;
private final String TEST_MESSAGE = "hello";
+ private static final InetAddress MULTICAST_ADDRESS = getMulticastAddress();
+ private static final NetworkInterface NETWORK_INTERFACE = getNetworkInterface();
+
+ private MembershipKey key;
+ private int port = -1;
private DatagramChannel client;
- private InetAddress sourceAddress = Inet4Address.LOOPBACK;
- private final static InetAddress MULTICAST_ADDRESS = getMulticastAddress();
- private final static NetworkInterface NETWORK_INTERFACE = getNetworkInterface();
+ private final InetAddress sourceAddress = Inet4Address.LOOPBACK;
private void init(boolean withSource) throws Exception {
client = DatagramChannel.open(StandardProtocolFamily.INET)
- .bind(new InetSocketAddress(Inet4Address.ANY, PORT));
+ .bind(new InetSocketAddress(Inet4Address.ANY, 0));
client.configureBlocking(false);
-
if (withSource) {
key = client.join(MULTICAST_ADDRESS, NETWORK_INTERFACE, sourceAddress);
} else {
key = client.join(MULTICAST_ADDRESS, NETWORK_INTERFACE);
}
+ port = client.socket().getLocalPort();
}
@Override
@@ -107,7 +108,7 @@
assertEquals(TEST_MESSAGE.length(), dc
.bind(new InetSocketAddress(Inet4Address.LOOPBACK, 0))
.send(ByteBuffer.wrap(TEST_MESSAGE.getBytes()),
- new InetSocketAddress(MULTICAST_ADDRESS, PORT)));
+ new InetSocketAddress(MULTICAST_ADDRESS, port)));
}
ByteBuffer buffer = ByteBuffer.allocate(1048);
@@ -173,7 +174,7 @@
assertEquals(TEST_MESSAGE.length(), dc
.bind(new InetSocketAddress(Inet4Address.LOOPBACK, 0))
.send(ByteBuffer.wrap(TEST_MESSAGE.getBytes()),
- new InetSocketAddress(MULTICAST_ADDRESS, PORT)));
+ new InetSocketAddress(MULTICAST_ADDRESS, port)));
}
ByteBuffer buffer = ByteBuffer.allocate(1048);
@@ -223,14 +224,14 @@
.bind(new InetSocketAddress(Inet4Address.LOOPBACK, 0))
.setOption(StandardSocketOptions.IP_MULTICAST_LOOP, true /* enable loop */)
.send(ByteBuffer.wrap(TEST_MESSAGE.getBytes()),
- new InetSocketAddress(MULTICAST_ADDRESS, PORT)));
+ new InetSocketAddress(MULTICAST_ADDRESS, port)));
}
ByteBuffer buffer = ByteBuffer.allocate(1048);
client.receive(buffer);
buffer.flip();
int limits = buffer.limit();
- byte bytes[] = new byte[limits];
+ byte[] bytes = new byte[limits];
buffer.get(bytes, 0, limits);
String receivedMessage = new String(bytes);
assertEquals(TEST_MESSAGE, receivedMessage);
diff --git a/mmodules/intracoreapi/api/intra/current.txt b/mmodules/intracoreapi/api/intra/current.txt
index ca1b674..003c067 100644
--- a/mmodules/intracoreapi/api/intra/current.txt
+++ b/mmodules/intracoreapi/api/intra/current.txt
@@ -127,7 +127,6 @@
package libcore.net {
@libcore.api.IntraCoreApi public abstract class NetworkSecurityPolicy {
- ctor @libcore.api.IntraCoreApi public NetworkSecurityPolicy();
method @libcore.api.IntraCoreApi public static libcore.net.NetworkSecurityPolicy getInstance();
method @libcore.api.IntraCoreApi public abstract boolean isCertificateTransparencyVerificationRequired(String);
}
