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

Commit fe358c6a authored by nharold's avatar nharold Committed by Gerrit Code Review
Browse files

Merge changes from topic 'ipsec-hide-overloads' 

* changes:
  Hide Socket+DatagramSocket IpSecTransform methods
  Consistenly Throw IOExceptions from IpSecManager
parents af5f00ee da18b028

api/current.txt

+2 −6
Original line number Diff line number Diff line
@@ -23888,14 +23888,10 @@ package android.net { 
  }















  public final class IpSecManager {













    method public void applyTransportModeTransform(java.net.Socket, android.net.IpSecTransform) throws java.io.IOException;













    method public void applyTransportModeTransform(java.net.DatagramSocket, android.net.IpSecTransform) throws java.io.IOException;















    method public void applyTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException;















    method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket(int) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;















    method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket() throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;













    method public void removeTransportModeTransform(java.net.Socket, android.net.IpSecTransform);













    method public void removeTransportModeTransform(java.net.DatagramSocket, android.net.IpSecTransform);













    method public void removeTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform);













    method public void removeTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException;















    method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress) throws android.net.IpSecManager.ResourceUnavailableException;















    method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;















    field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0









@@ -23914,7 +23910,7 @@ package android.net {













  }





























  public static final class IpSecManager.UdpEncapsulationSocket implements java.lang.AutoCloseable {













    method public void close();













    method public void close() throws java.io.IOException;















    method public int getPort();















    method public java.io.FileDescriptor getSocket();















  }

























api/system-current.txt



+2
−6




























Original line number
Diff line number
Diff line








@@ -25726,14 +25726,10 @@ package android.net {













  }





























  public final class IpSecManager {













    method public void applyTransportModeTransform(java.net.Socket, android.net.IpSecTransform) throws java.io.IOException;













    method public void applyTransportModeTransform(java.net.DatagramSocket, android.net.IpSecTransform) throws java.io.IOException;















    method public void applyTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException;















    method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket(int) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;















    method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket() throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;













    method public void removeTransportModeTransform(java.net.Socket, android.net.IpSecTransform);













    method public void removeTransportModeTransform(java.net.DatagramSocket, android.net.IpSecTransform);













    method public void removeTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform);













    method public void removeTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException;















    method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress) throws android.net.IpSecManager.ResourceUnavailableException;















    method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;















    field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0









@@ -25752,7 +25748,7 @@ package android.net {













  }





























  public static final class IpSecManager.UdpEncapsulationSocket implements java.lang.AutoCloseable {













    method public void close();













    method public void close() throws java.io.IOException;















    method public int getPort();















    method public java.io.FileDescriptor getSocket();















  }

























api/test-current.txt



+2
−6




























Original line number
Diff line number
Diff line








@@ -23962,14 +23962,10 @@ package android.net {













  }





























  public final class IpSecManager {













    method public void applyTransportModeTransform(java.net.Socket, android.net.IpSecTransform) throws java.io.IOException;













    method public void applyTransportModeTransform(java.net.DatagramSocket, android.net.IpSecTransform) throws java.io.IOException;















    method public void applyTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException;















    method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket(int) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;















    method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket() throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;













    method public void removeTransportModeTransform(java.net.Socket, android.net.IpSecTransform);













    method public void removeTransportModeTransform(java.net.DatagramSocket, android.net.IpSecTransform);













    method public void removeTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform);













    method public void removeTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException;















    method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress) throws android.net.IpSecManager.ResourceUnavailableException;















    method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;















    field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0









@@ -23988,7 +23984,7 @@ package android.net {













  }





























  public static final class IpSecManager.UdpEncapsulationSocket implements java.lang.AutoCloseable {













    method public void close();













    method public void close() throws java.io.IOException;















    method public int getPort();















    method public java.io.FileDescriptor getSocket();















  }

























core/java/android/net/IpSecManager.java



+12
−5




























Original line number
Diff line number
Diff line








@@ -245,6 +245,7 @@ public final class IpSecManager {













     *















     * @param socket a stream socket















     * @param transform an {@link IpSecTransform}, which must be an active Transport Mode transform.













     * @hide















     */















    public void applyTransportModeTransform(Socket socket, IpSecTransform transform)















            throws IOException {









@@ -262,6 +263,7 @@ public final class IpSecManager {













     *















     * @param socket a datagram socket















     * @param transform an {@link IpSecTransform}, which must be an active Transport Mode transform.













     * @hide















     */















    public void applyTransportModeTransform(DatagramSocket socket, IpSecTransform transform)















            throws IOException {









@@ -284,7 +286,7 @@ public final class IpSecManager {













     * address associated with that transform will throw an IOException. In addition, if the















     * IpSecTransform is later deactivated, the socket will throw an IOException on any calls to















     * send() or receive() until the transform is removed from the socket by calling {@link













     * #removeTransportModeTransform(Socket, IpSecTransform)};













     * #removeTransportModeTransform(FileDescriptor, IpSecTransform)};















     *















     * @param socket a socket file descriptor















     * @param transform an {@link IpSecTransform}, which must be an active Transport Mode transform.










@@ -316,8 +318,10 @@ public final class IpSecManager {













     *















     * @param socket a socket that previously had a transform applied to it.















     * @param transform the IPsec Transform that was previously applied to the given socket













     * @hide















     */













    public void removeTransportModeTransform(Socket socket, IpSecTransform transform) {













    public void removeTransportModeTransform(Socket socket, IpSecTransform transform)













            throws IOException {















        removeTransportModeTransform(ParcelFileDescriptor.fromSocket(socket), transform);















    }

























@@ -330,8 +334,10 @@ public final class IpSecManager {













     *















     * @param socket a socket that previously had a transform applied to it.















     * @param transform the IPsec Transform that was previously applied to the given socket













     * @hide















     */













    public void removeTransportModeTransform(DatagramSocket socket, IpSecTransform transform) {













    public void removeTransportModeTransform(DatagramSocket socket, IpSecTransform transform)













            throws IOException {















        removeTransportModeTransform(ParcelFileDescriptor.fromDatagramSocket(socket), transform);















    }

























@@ -345,7 +351,8 @@ public final class IpSecManager {













     * @param socket a socket file descriptor that previously had a transform applied to it.















     * @param transform the IPsec Transform that was previously applied to the given socket















     */













    public void removeTransportModeTransform(FileDescriptor socket, IpSecTransform transform) {













    public void removeTransportModeTransform(FileDescriptor socket, IpSecTransform transform)













            throws IOException {















        removeTransportModeTransform(new ParcelFileDescriptor(socket), transform);















    }


























@@ -419,7 +426,7 @@ public final class IpSecManager {













         *















         * @param fd a file descriptor previously returned as a UDP Encapsulation socket.















         */













        public void close() {













        public void close() throws IOException {















            // TODO: Go close the socket















            mCloseGuard.close();















        }