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

Merge "Un-finalize IpSecManager" am: 59f6394516 am: 44cc9d20d1 am: 4da8bc86b3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1970081

Change-Id: I65921b1d2887efae58dbd8e423d659e00dc98104
This commit is contained in:
Yan Yan
2022-02-10 02:27:39 +00:00
committed by Automerger Merge Worker
parent 32f716b417 4da8bc86b3
commit 39e6068323
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -25314,7 +25314,7 @@ package android.net {
field public static final String CRYPT_AES_CTR = "rfc3686(ctr(aes))";
}
public final class IpSecManager {
public class IpSecManager {
method @NonNull public android.net.IpSecManager.SecurityParameterIndex allocateSecurityParameterIndex(@NonNull java.net.InetAddress) throws android.net.IpSecManager.ResourceUnavailableException;
method @NonNull public android.net.IpSecManager.SecurityParameterIndex allocateSecurityParameterIndex(@NonNull java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;
method public void applyTransportModeTransform(@NonNull java.net.Socket, int, @NonNull android.net.IpSecTransform) throws java.io.IOException;

2
core/api/module-lib-current.txt
View File

@@ -226,7 +226,7 @@ package android.net {
field @NonNull public static final android.os.Parcelable.Creator<android.net.EthernetNetworkSpecifier> CREATOR;
}
public final class IpSecManager {
public class IpSecManager {
field public static final int DIRECTION_FWD = 2; // 0x2
}

2
core/api/system-current.txt
View File

@@ -7102,7 +7102,7 @@ package android.net {
field @NonNull public static final android.os.Parcelable.Creator<android.net.EthernetNetworkUpdateRequest> CREATOR;
}
public final class IpSecManager {
public class IpSecManager {
method @RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS) public void applyTunnelModeTransform(@NonNull android.net.IpSecManager.IpSecTunnelInterface, int, @NonNull android.net.IpSecTransform) throws java.io.IOException;
method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS) public android.net.IpSecManager.IpSecTunnelInterface createIpSecTunnelInterface(@NonNull java.net.InetAddress, @NonNull java.net.InetAddress, @NonNull android.net.Network) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;
}

2
core/api/test-current.txt
View File

@@ -1590,7 +1590,7 @@ package android.net {
method public void setIncludeTestInterfaces(boolean);
}
public final class IpSecManager {
public class IpSecManager {
field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0
}

2
packages/ConnectivityT/framework-t/src/android/net/IpSecManager.java
View File

@@ -61,7 +61,7 @@ import java.util.Objects;
* Internet Protocol</a>
*/
@SystemService(Context.IPSEC_SERVICE)
public final class IpSecManager {
public class IpSecManager {
private static final String TAG = "IpSecManager";
/**