From a64b019f94c2ac528903358e5c2bac402a927d00 Mon Sep 17 00:00:00 2001 From: Nathan Harold Date: Mon, 17 Apr 2017 17:11:58 -0700 Subject: [PATCH] Consistenly Throw IOExceptions from IpSecManager Bug: 36073210 Test: api-update Change-Id: Ia3825e85b09b6330f1326a26cf9e1cadf9dacf71 --- core/java/android/net/IpSecManager.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/core/java/android/net/IpSecManager.java b/core/java/android/net/IpSecManager.java index f8702e2e00..1a55b37665 100644 --- a/core/java/android/net/IpSecManager.java +++ b/core/java/android/net/IpSecManager.java @@ -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(); }