From 8cd28adbc5fb6a21e5bef7f74ec6f24112a88b58 Mon Sep 17 00:00:00 2001 From: Yan Yan Date: Wed, 7 Oct 2020 18:48:57 -0700 Subject: [PATCH] [API] Expose IpSecTunnelInterface#setUnderlyingNetwork This API is required to perform MOBIKE. This API allows an IPsec peer to change the underlying network of its established IPsec tunnel without re-establishing the tunnel. Bug: 169855650 Test: atest IpSecManagerTunnelTest (new tests added) Change-Id: Ifc8ad902cbfbe4ad07e715f2fef0faa1bf9d68f3 --- core/api/system-current.txt | 1 + core/java/android/net/IpSecManager.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index e4173a53c82ca..0ae65cef2e983 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -6150,6 +6150,7 @@ package android.net { method public void close(); method @NonNull public String getInterfaceName(); method @RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS) public void removeAddress(@NonNull java.net.InetAddress, int) throws java.io.IOException; + method @RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS) public void setUnderlyingNetwork(@NonNull android.net.Network) throws java.io.IOException; } public static class IpSecTransform.Builder { diff --git a/core/java/android/net/IpSecManager.java b/core/java/android/net/IpSecManager.java index 55fdafcea6ee5..98acd98cc465f 100644 --- a/core/java/android/net/IpSecManager.java +++ b/core/java/android/net/IpSecManager.java @@ -801,7 +801,6 @@ public final class IpSecManager { * @param underlyingNetwork the new {@link Network} that will carry traffic for this tunnel. * This network MUST never be the network exposing this IpSecTunnelInterface, otherwise * this method will throw an {@link IllegalArgumentException}. - * @hide */ // TODO: b/169171001 Update the documentation when transform migration is supported. // The purpose of making updating network and applying transforms separate is to leave open