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

Commit 05c7b5ad authored by Nathan Harold's avatar Nathan Harold
Browse files

Consistenly Throw IOExceptions from IpSecManager 

Bug: 36073210
Test: api-update
Change-Id: Ia3825e85b09b6330f1326a26cf9e1cadf9dacf71
Merged-In: Ia3825e85b09b6330f1326a26cf9e1cadf9dacf71
(cherry picked from commit c2fd6cfdc9dce33d57a3c2780e0527dd4b1bfeb9)
parent 5b06dbd1

api/current.txt

+4 −4
Original line number Diff line number Diff line
@@ -25564,9 +25564,9 @@ package android.net { 
    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.net.Socket, android.net.IpSecTransform) throws java.io.IOException;

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

    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
@@ -25585,7 +25585,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



+4
−4




























Original line number
Diff line number
Diff line








@@ -27751,9 +27751,9 @@ package android.net {













    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.net.Socket, android.net.IpSecTransform) throws java.io.IOException;













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













    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









@@ -27772,7 +27772,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



+4
−4




























Original line number
Diff line number
Diff line








@@ -25671,9 +25671,9 @@ package android.net {













    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.net.Socket, android.net.IpSecTransform) throws java.io.IOException;













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













    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









@@ -25692,7 +25692,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



+7
−4




























Original line number
Diff line number
Diff line








@@ -317,7 +317,8 @@ 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















     */













    public void removeTransportModeTransform(Socket socket, IpSecTransform transform) {













    public void removeTransportModeTransform(Socket socket, IpSecTransform transform)













            throws IOException {















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















    }

























@@ -331,7 +332,8 @@ 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















     */













    public void removeTransportModeTransform(DatagramSocket socket, IpSecTransform transform) {













    public void removeTransportModeTransform(DatagramSocket socket, IpSecTransform transform)













            throws IOException {















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















    }

























@@ -345,7 +347,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 +422,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();















        }