Consistenly Throw IOExceptions from IpSecManager
Bug: 36073210 Test: api-update Change-Id: Ia3825e85b09b6330f1326a26cf9e1cadf9dacf71 Merged-In: Ia3825e85b09b6330f1326a26cf9e1cadf9dacf71 (cherry picked from commit c2fd6cfdc9dce33d57a3c2780e0527dd4b1bfeb9)
This commit is contained in:
@@ -317,7 +317,8 @@ public final class IpSecManager {
|
|||||||
* @param socket a socket that previously had a transform applied to it.
|
* @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
|
* @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);
|
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 socket a socket that previously had a transform applied to it.
|
||||||
* @param transform the IPsec Transform that was previously applied to the given socket
|
* @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);
|
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 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
|
* @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);
|
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.
|
* @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
|
// TODO: Go close the socket
|
||||||
mCloseGuard.close();
|
mCloseGuard.close();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user