Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Expose add/removeAddress for IpSecInterfaces" am: 8e2b079f56 am: 189292cc36" into pi-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2018-03-21 04:45:42 +00:00
committed by Android (Google) Code Review
parent 9079589e0c 763352f1f5
commit 45dcce7cce
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -3035,8 +3035,10 @@ package android.net {
} }
public static final class IpSecManager.IpSecTunnelInterface implements java.lang.AutoCloseable { public static final class IpSecManager.IpSecTunnelInterface implements java.lang.AutoCloseable {
method public void addAddress(android.net.LinkAddress) throws java.io.IOException;
method public void close(); method public void close();
method public java.lang.String getInterfaceName(); method public java.lang.String getInterfaceName();
method public void removeAddress(android.net.LinkAddress) throws java.io.IOException;
} }
public final class IpSecTransform implements java.lang.AutoCloseable { public final class IpSecTransform implements java.lang.AutoCloseable {

6
core/java/android/net/IpSecManager.java
View File

@@ -658,7 +658,8 @@ public final class IpSecManager {
* @param address the local address for traffic inside the tunnel * @param address the local address for traffic inside the tunnel
* @hide * @hide
*/ */
public void addAddress(LinkAddress address) { @SystemApi
public void addAddress(LinkAddress address) throws IOException {
try { try {
mService.addAddressToTunnelInterface(mResourceId, address); mService.addAddressToTunnelInterface(mResourceId, address);
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -674,7 +675,8 @@ public final class IpSecManager {
* @param address to be removed * @param address to be removed
* @hide * @hide
*/ */
public void removeAddress(LinkAddress address) { @SystemApi
public void removeAddress(LinkAddress address) throws IOException {
try { try {
mService.removeAddressFromTunnelInterface(mResourceId, address); mService.removeAddressFromTunnelInterface(mResourceId, address);
} catch (RemoteException e) { } catch (RemoteException e) {