Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18941cb5 authored by Shubham Ajmera's avatar Shubham Ajmera Committed by Gerrit Code Review
Browse files

Merge "Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a"

parents 06561db2 30cbe3b2

api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -51033,6 +51033,7 @@ package java.nio.channels { 
    method public abstract java.util.concurrent.Future<java.nio.channels.AsynchronousSocketChannel> accept();

    method public final java.nio.channels.AsynchronousServerSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;

    method public abstract java.nio.channels.AsynchronousServerSocketChannel bind(java.net.SocketAddress, int) throws java.io.IOException;

    method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;

    method public static java.nio.channels.AsynchronousServerSocketChannel open(java.nio.channels.AsynchronousChannelGroup) throws java.io.IOException;

    method public static java.nio.channels.AsynchronousServerSocketChannel open() throws java.io.IOException;

    method public final java.nio.channels.spi.AsynchronousChannelProvider provider();
@@ -51044,6 +51045,7 @@ package java.nio.channels { 
    method public abstract java.nio.channels.AsynchronousSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;

    method public abstract void connect(java.net.SocketAddress, A, java.nio.channels.CompletionHandler<java.lang.Void, ? super A>);

    method public abstract java.util.concurrent.Future<java.lang.Void> connect(java.net.SocketAddress);

    method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;

    method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;

    method public static java.nio.channels.AsynchronousSocketChannel open(java.nio.channels.AsynchronousChannelGroup) throws java.io.IOException;

    method public static java.nio.channels.AsynchronousSocketChannel open() throws java.io.IOException;
@@ -51112,6 +51114,7 @@ package java.nio.channels { 
    method public abstract java.nio.channels.DatagramChannel bind(java.net.SocketAddress) throws java.io.IOException;

    method public abstract java.nio.channels.DatagramChannel connect(java.net.SocketAddress) throws java.io.IOException;

    method public abstract java.nio.channels.DatagramChannel disconnect() throws java.io.IOException;

    method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;

    method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;

    method public abstract boolean isConnected();

    method public static java.nio.channels.DatagramChannel open() throws java.io.IOException;
@@ -51347,6 +51350,7 @@ package java.nio.channels { 
    method public abstract java.nio.channels.SocketChannel accept() throws java.io.IOException;

    method public final java.nio.channels.ServerSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;

    method public abstract java.nio.channels.ServerSocketChannel bind(java.net.SocketAddress, int) throws java.io.IOException;

    method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;

    method public static java.nio.channels.ServerSocketChannel open() throws java.io.IOException;

    method public abstract java.nio.channels.ServerSocketChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;

    method public abstract java.net.ServerSocket socket();
@@ -51362,6 +51366,7 @@ package java.nio.channels { 
    method public abstract java.nio.channels.SocketChannel bind(java.net.SocketAddress) throws java.io.IOException;

    method public abstract boolean connect(java.net.SocketAddress) throws java.io.IOException;

    method public abstract boolean finishConnect() throws java.io.IOException;

    method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;

    method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;

    method public abstract boolean isConnected();

    method public abstract boolean isConnectionPending();

api/system-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -53651,6 +53651,7 @@ package java.nio.channels { 
    method public abstract java.util.concurrent.Future<java.nio.channels.AsynchronousSocketChannel> accept();

    method public final java.nio.channels.AsynchronousServerSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;

    method public abstract java.nio.channels.AsynchronousServerSocketChannel bind(java.net.SocketAddress, int) throws java.io.IOException;

    method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;

    method public static java.nio.channels.AsynchronousServerSocketChannel open(java.nio.channels.AsynchronousChannelGroup) throws java.io.IOException;

    method public static java.nio.channels.AsynchronousServerSocketChannel open() throws java.io.IOException;

    method public final java.nio.channels.spi.AsynchronousChannelProvider provider();
@@ -53662,6 +53663,7 @@ package java.nio.channels { 
    method public abstract java.nio.channels.AsynchronousSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;

    method public abstract void connect(java.net.SocketAddress, A, java.nio.channels.CompletionHandler<java.lang.Void, ? super A>);

    method public abstract java.util.concurrent.Future<java.lang.Void> connect(java.net.SocketAddress);

    method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;

    method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;

    method public static java.nio.channels.AsynchronousSocketChannel open(java.nio.channels.AsynchronousChannelGroup) throws java.io.IOException;

    method public static java.nio.channels.AsynchronousSocketChannel open() throws java.io.IOException;
@@ -53730,6 +53732,7 @@ package java.nio.channels { 
    method public abstract java.nio.channels.DatagramChannel bind(java.net.SocketAddress) throws java.io.IOException;

    method public abstract java.nio.channels.DatagramChannel connect(java.net.SocketAddress) throws java.io.IOException;

    method public abstract java.nio.channels.DatagramChannel disconnect() throws java.io.IOException;

    method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;

    method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;

    method public abstract boolean isConnected();

    method public static java.nio.channels.DatagramChannel open() throws java.io.IOException;
@@ -53965,6 +53968,7 @@ package java.nio.channels { 
    method public abstract java.nio.channels.SocketChannel accept() throws java.io.IOException;

    method public final java.nio.channels.ServerSocketChannel bind(java.net.SocketAddress) throws java.io.IOException;

    method public abstract java.nio.channels.ServerSocketChannel bind(java.net.SocketAddress, int) throws java.io.IOException;

    method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;

    method public static java.nio.channels.ServerSocketChannel open() throws java.io.IOException;

    method public abstract java.nio.channels.ServerSocketChannel setOption(java.net.SocketOption<T>, T) throws java.io.IOException;

    method public abstract java.net.ServerSocket socket();
@@ -53980,6 +53984,7 @@ package java.nio.channels { 
    method public abstract java.nio.channels.SocketChannel bind(java.net.SocketAddress) throws java.io.IOException;

    method public abstract boolean connect(java.net.SocketAddress) throws java.io.IOException;

    method public abstract boolean finishConnect() throws java.io.IOException;

    method public abstract java.net.SocketAddress getLocalAddress() throws java.io.IOException;

    method public abstract java.net.SocketAddress getRemoteAddress() throws java.io.IOException;

    method public abstract boolean isConnected();

    method public abstract boolean isConnectionPending();