drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split out the ipsec API surface and use framework-connectivity-tiramisu

Browse Source 
(cherry picked from commit 1dad7aa006492035293e68080aeaf606df02618a)
Bug: 204153604
Test: TH
Change-Id: I6cc8aef6a0ab9ce4bcef2797196b1d1b3687acca
Merged-In: I6cc8aef6a0ab9ce4bcef2797196b1d1b3687acca
This commit is contained in:
Aaron Huang 2022-01-12 15:11:01 +08:00 committed by Lorenzo Colitti
parent f690faccf0
commit 794d210854
12 changed files with 12 additions and 381 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

213
boot/hiddenapi/hiddenapi-max-target-o.txt
View File

@ -35446,51 +35446,6 @@ Landroid/net/IIpConnectivityMetrics$Stub;->TRANSACTION_removeNetdEventCallback:I
Landroid/net/IIpConnectivityMetrics;->addNetdEventCallback(ILandroid/net/INetdEventCallback;)Z
Landroid/net/IIpConnectivityMetrics;->logEvent(Landroid/net/ConnectivityMetricsEvent;)I
Landroid/net/IIpConnectivityMetrics;->removeNetdEventCallback(I)Z
Landroid/net/IIpSecService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/net/IIpSecService$Stub$Proxy;->addAddressToTunnelInterface(ILandroid/net/LinkAddress;Ljava/lang/String;)V
Landroid/net/IIpSecService$Stub$Proxy;->allocateSecurityParameterIndex(Ljava/lang/String;ILandroid/os/IBinder;)Landroid/net/IpSecSpiResponse;
Landroid/net/IIpSecService$Stub$Proxy;->applyTransportModeTransform(Landroid/os/ParcelFileDescriptor;II)V
Landroid/net/IIpSecService$Stub$Proxy;->applyTunnelModeTransform(IIILjava/lang/String;)V
Landroid/net/IIpSecService$Stub$Proxy;->closeUdpEncapsulationSocket(I)V
Landroid/net/IIpSecService$Stub$Proxy;->createTransform(Landroid/net/IpSecConfig;Landroid/os/IBinder;Ljava/lang/String;)Landroid/net/IpSecTransformResponse;
Landroid/net/IIpSecService$Stub$Proxy;->createTunnelInterface(Ljava/lang/String;Ljava/lang/String;Landroid/net/Network;Landroid/os/IBinder;Ljava/lang/String;)Landroid/net/IpSecTunnelInterfaceResponse;
Landroid/net/IIpSecService$Stub$Proxy;->deleteTransform(I)V
Landroid/net/IIpSecService$Stub$Proxy;->deleteTunnelInterface(ILjava/lang/String;)V
Landroid/net/IIpSecService$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
Landroid/net/IIpSecService$Stub$Proxy;->mRemote:Landroid/os/IBinder;
Landroid/net/IIpSecService$Stub$Proxy;->openUdpEncapsulationSocket(ILandroid/os/IBinder;)Landroid/net/IpSecUdpEncapResponse;
Landroid/net/IIpSecService$Stub$Proxy;->releaseSecurityParameterIndex(I)V
Landroid/net/IIpSecService$Stub$Proxy;->removeAddressFromTunnelInterface(ILandroid/net/LinkAddress;Ljava/lang/String;)V
Landroid/net/IIpSecService$Stub$Proxy;->removeTransportModeTransforms(Landroid/os/ParcelFileDescriptor;)V
Landroid/net/IIpSecService$Stub;-><init>()V
Landroid/net/IIpSecService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/IIpSecService;
Landroid/net/IIpSecService$Stub;->DESCRIPTOR:Ljava/lang/String;
Landroid/net/IIpSecService$Stub;->TRANSACTION_addAddressToTunnelInterface:I
Landroid/net/IIpSecService$Stub;->TRANSACTION_allocateSecurityParameterIndex:I
Landroid/net/IIpSecService$Stub;->TRANSACTION_applyTransportModeTransform:I
Landroid/net/IIpSecService$Stub;->TRANSACTION_applyTunnelModeTransform:I
Landroid/net/IIpSecService$Stub;->TRANSACTION_closeUdpEncapsulationSocket:I
Landroid/net/IIpSecService$Stub;->TRANSACTION_createTransform:I
Landroid/net/IIpSecService$Stub;->TRANSACTION_createTunnelInterface:I
Landroid/net/IIpSecService$Stub;->TRANSACTION_deleteTransform:I
Landroid/net/IIpSecService$Stub;->TRANSACTION_deleteTunnelInterface:I
Landroid/net/IIpSecService$Stub;->TRANSACTION_openUdpEncapsulationSocket:I
Landroid/net/IIpSecService$Stub;->TRANSACTION_releaseSecurityParameterIndex:I
Landroid/net/IIpSecService$Stub;->TRANSACTION_removeAddressFromTunnelInterface:I
Landroid/net/IIpSecService$Stub;->TRANSACTION_removeTransportModeTransforms:I
Landroid/net/IIpSecService;->addAddressToTunnelInterface(ILandroid/net/LinkAddress;Ljava/lang/String;)V
Landroid/net/IIpSecService;->allocateSecurityParameterIndex(Ljava/lang/String;ILandroid/os/IBinder;)Landroid/net/IpSecSpiResponse;
Landroid/net/IIpSecService;->applyTransportModeTransform(Landroid/os/ParcelFileDescriptor;II)V
Landroid/net/IIpSecService;->applyTunnelModeTransform(IIILjava/lang/String;)V
Landroid/net/IIpSecService;->closeUdpEncapsulationSocket(I)V
Landroid/net/IIpSecService;->createTransform(Landroid/net/IpSecConfig;Landroid/os/IBinder;Ljava/lang/String;)Landroid/net/IpSecTransformResponse;
Landroid/net/IIpSecService;->createTunnelInterface(Ljava/lang/String;Ljava/lang/String;Landroid/net/Network;Landroid/os/IBinder;Ljava/lang/String;)Landroid/net/IpSecTunnelInterfaceResponse;
Landroid/net/IIpSecService;->deleteTransform(I)V
Landroid/net/IIpSecService;->deleteTunnelInterface(ILjava/lang/String;)V
Landroid/net/IIpSecService;->openUdpEncapsulationSocket(ILandroid/os/IBinder;)Landroid/net/IpSecUdpEncapResponse;
Landroid/net/IIpSecService;->releaseSecurityParameterIndex(I)V
Landroid/net/IIpSecService;->removeAddressFromTunnelInterface(ILandroid/net/LinkAddress;Ljava/lang/String;)V
Landroid/net/IIpSecService;->removeTransportModeTransforms(Landroid/os/ParcelFileDescriptor;)V
Landroid/net/INetd$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/net/INetd$Stub$Proxy;->addVirtualTunnelInterface(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;II)V
Landroid/net/INetd$Stub$Proxy;->bandwidthEnableDataSaver(Z)Z
@ -35914,174 +35869,6 @@ Landroid/net/InterfaceConfiguration;->mFlags:Ljava/util/HashSet;
Landroid/net/InterfaceConfiguration;->mHwAddr:Ljava/lang/String;
Landroid/net/InterfaceConfiguration;->setHardwareAddress(Ljava/lang/String;)V
Landroid/net/InterfaceConfiguration;->validateFlag(Ljava/lang/String;)V
Landroid/net/IpSecAlgorithm;->checkValidOrThrow(Ljava/lang/String;II)V
Landroid/net/IpSecAlgorithm;->CRYPT_NULL:Ljava/lang/String;
Landroid/net/IpSecAlgorithm;->equals(Landroid/net/IpSecAlgorithm;Landroid/net/IpSecAlgorithm;)Z
Landroid/net/IpSecAlgorithm;->isAead()Z
Landroid/net/IpSecAlgorithm;->isAuthentication()Z
Landroid/net/IpSecAlgorithm;->isEncryption()Z
Landroid/net/IpSecAlgorithm;->isUnsafeBuild()Z
Landroid/net/IpSecAlgorithm;->mKey:[B
Landroid/net/IpSecAlgorithm;->mName:Ljava/lang/String;
Landroid/net/IpSecAlgorithm;->mTruncLenBits:I
Landroid/net/IpSecAlgorithm;->TAG:Ljava/lang/String;
Landroid/net/IpSecConfig;-><init>()V
Landroid/net/IpSecConfig;-><init>(Landroid/net/IpSecConfig;)V
Landroid/net/IpSecConfig;-><init>(Landroid/os/Parcel;)V
Landroid/net/IpSecConfig;->CREATOR:Landroid/os/Parcelable$Creator;
Landroid/net/IpSecConfig;->equals(Landroid/net/IpSecConfig;Landroid/net/IpSecConfig;)Z
Landroid/net/IpSecConfig;->getAuthenticatedEncryption()Landroid/net/IpSecAlgorithm;
Landroid/net/IpSecConfig;->getAuthentication()Landroid/net/IpSecAlgorithm;
Landroid/net/IpSecConfig;->getDestinationAddress()Ljava/lang/String;
Landroid/net/IpSecConfig;->getEncapRemotePort()I
Landroid/net/IpSecConfig;->getEncapSocketResourceId()I
Landroid/net/IpSecConfig;->getEncapType()I
Landroid/net/IpSecConfig;->getEncryption()Landroid/net/IpSecAlgorithm;
Landroid/net/IpSecConfig;->getMarkMask()I
Landroid/net/IpSecConfig;->getMarkValue()I
Landroid/net/IpSecConfig;->getMode()I
Landroid/net/IpSecConfig;->getNattKeepaliveInterval()I
Landroid/net/IpSecConfig;->getNetwork()Landroid/net/Network;
Landroid/net/IpSecConfig;->getSourceAddress()Ljava/lang/String;
Landroid/net/IpSecConfig;->getSpiResourceId()I
Landroid/net/IpSecConfig;->mAuthenticatedEncryption:Landroid/net/IpSecAlgorithm;
Landroid/net/IpSecConfig;->mAuthentication:Landroid/net/IpSecAlgorithm;
Landroid/net/IpSecConfig;->mDestinationAddress:Ljava/lang/String;
Landroid/net/IpSecConfig;->mEncapRemotePort:I
Landroid/net/IpSecConfig;->mEncapSocketResourceId:I
Landroid/net/IpSecConfig;->mEncapType:I
Landroid/net/IpSecConfig;->mEncryption:Landroid/net/IpSecAlgorithm;
Landroid/net/IpSecConfig;->mMarkMask:I
Landroid/net/IpSecConfig;->mMarkValue:I
Landroid/net/IpSecConfig;->mMode:I
Landroid/net/IpSecConfig;->mNattKeepaliveInterval:I
Landroid/net/IpSecConfig;->mNetwork:Landroid/net/Network;
Landroid/net/IpSecConfig;->mSourceAddress:Ljava/lang/String;
Landroid/net/IpSecConfig;->mSpiResourceId:I
Landroid/net/IpSecConfig;->setAuthenticatedEncryption(Landroid/net/IpSecAlgorithm;)V
Landroid/net/IpSecConfig;->setAuthentication(Landroid/net/IpSecAlgorithm;)V
Landroid/net/IpSecConfig;->setDestinationAddress(Ljava/lang/String;)V
Landroid/net/IpSecConfig;->setEncapRemotePort(I)V
Landroid/net/IpSecConfig;->setEncapSocketResourceId(I)V
Landroid/net/IpSecConfig;->setEncapType(I)V
Landroid/net/IpSecConfig;->setEncryption(Landroid/net/IpSecAlgorithm;)V
Landroid/net/IpSecConfig;->setMarkMask(I)V
Landroid/net/IpSecConfig;->setMarkValue(I)V
Landroid/net/IpSecConfig;->setMode(I)V
Landroid/net/IpSecConfig;->setNattKeepaliveInterval(I)V
Landroid/net/IpSecConfig;->setNetwork(Landroid/net/Network;)V
Landroid/net/IpSecConfig;->setSourceAddress(Ljava/lang/String;)V
Landroid/net/IpSecConfig;->setSpiResourceId(I)V
Landroid/net/IpSecConfig;->TAG:Ljava/lang/String;
Landroid/net/IpSecManager$IpSecTunnelInterface;-><init>(Landroid/content/Context;Landroid/net/IIpSecService;Ljava/net/InetAddress;Ljava/net/InetAddress;Landroid/net/Network;)V
Landroid/net/IpSecManager$IpSecTunnelInterface;->addAddress(Ljava/net/InetAddress;I)V
Landroid/net/IpSecManager$IpSecTunnelInterface;->getInterfaceName()Ljava/lang/String;
Landroid/net/IpSecManager$IpSecTunnelInterface;->getResourceId()I
Landroid/net/IpSecManager$IpSecTunnelInterface;->mCloseGuard:Ldalvik/system/CloseGuard;
Landroid/net/IpSecManager$IpSecTunnelInterface;->mInterfaceName:Ljava/lang/String;
Landroid/net/IpSecManager$IpSecTunnelInterface;->mLocalAddress:Ljava/net/InetAddress;
Landroid/net/IpSecManager$IpSecTunnelInterface;->mOpPackageName:Ljava/lang/String;
Landroid/net/IpSecManager$IpSecTunnelInterface;->mRemoteAddress:Ljava/net/InetAddress;
Landroid/net/IpSecManager$IpSecTunnelInterface;->mResourceId:I
Landroid/net/IpSecManager$IpSecTunnelInterface;->mService:Landroid/net/IIpSecService;
Landroid/net/IpSecManager$IpSecTunnelInterface;->mUnderlyingNetwork:Landroid/net/Network;
Landroid/net/IpSecManager$IpSecTunnelInterface;->removeAddress(Ljava/net/InetAddress;I)V
Landroid/net/IpSecManager$ResourceUnavailableException;-><init>(Ljava/lang/String;)V
Landroid/net/IpSecManager$SecurityParameterIndex;-><init>(Landroid/net/IIpSecService;Ljava/net/InetAddress;I)V
Landroid/net/IpSecManager$SecurityParameterIndex;->getResourceId()I
Landroid/net/IpSecManager$SecurityParameterIndex;->mCloseGuard:Ldalvik/system/CloseGuard;
Landroid/net/IpSecManager$SecurityParameterIndex;->mDestinationAddress:Ljava/net/InetAddress;
Landroid/net/IpSecManager$SecurityParameterIndex;->mResourceId:I
Landroid/net/IpSecManager$SecurityParameterIndex;->mService:Landroid/net/IIpSecService;
Landroid/net/IpSecManager$SecurityParameterIndex;->mSpi:I
Landroid/net/IpSecManager$SpiUnavailableException;-><init>(Ljava/lang/String;I)V
Landroid/net/IpSecManager$SpiUnavailableException;->mSpi:I
Landroid/net/IpSecManager$Status;->OK:I
Landroid/net/IpSecManager$Status;->RESOURCE_UNAVAILABLE:I
Landroid/net/IpSecManager$Status;->SPI_UNAVAILABLE:I
Landroid/net/IpSecManager$UdpEncapsulationSocket;-><init>(Landroid/net/IIpSecService;I)V
Landroid/net/IpSecManager$UdpEncapsulationSocket;->getResourceId()I
Landroid/net/IpSecManager$UdpEncapsulationSocket;->mCloseGuard:Ldalvik/system/CloseGuard;
Landroid/net/IpSecManager$UdpEncapsulationSocket;->mPfd:Landroid/os/ParcelFileDescriptor;
Landroid/net/IpSecManager$UdpEncapsulationSocket;->mPort:I
Landroid/net/IpSecManager$UdpEncapsulationSocket;->mResourceId:I
Landroid/net/IpSecManager$UdpEncapsulationSocket;->mService:Landroid/net/IIpSecService;
Landroid/net/IpSecManager;-><init>(Landroid/content/Context;Landroid/net/IIpSecService;)V
Landroid/net/IpSecManager;->applyTunnelModeTransform(Landroid/net/IpSecManager$IpSecTunnelInterface;ILandroid/net/IpSecTransform;)V
Landroid/net/IpSecManager;->createIpSecTunnelInterface(Ljava/net/InetAddress;Ljava/net/InetAddress;Landroid/net/Network;)Landroid/net/IpSecManager$IpSecTunnelInterface;
Landroid/net/IpSecManager;->INVALID_RESOURCE_ID:I
Landroid/net/IpSecManager;->maybeHandleServiceSpecificException(Landroid/os/ServiceSpecificException;)V
Landroid/net/IpSecManager;->mContext:Landroid/content/Context;
Landroid/net/IpSecManager;->mService:Landroid/net/IIpSecService;
Landroid/net/IpSecManager;->removeTunnelModeTransform(Landroid/net/Network;Landroid/net/IpSecTransform;)V
Landroid/net/IpSecManager;->rethrowCheckedExceptionFromServiceSpecificException(Landroid/os/ServiceSpecificException;)Ljava/io/IOException;
Landroid/net/IpSecManager;->rethrowUncheckedExceptionFromServiceSpecificException(Landroid/os/ServiceSpecificException;)Ljava/lang/RuntimeException;
Landroid/net/IpSecManager;->TAG:Ljava/lang/String;
Landroid/net/IpSecSpiResponse;-><init>(I)V
Landroid/net/IpSecSpiResponse;-><init>(III)V
Landroid/net/IpSecSpiResponse;-><init>(Landroid/os/Parcel;)V
Landroid/net/IpSecSpiResponse;->CREATOR:Landroid/os/Parcelable$Creator;
Landroid/net/IpSecSpiResponse;->resourceId:I
Landroid/net/IpSecSpiResponse;->spi:I
Landroid/net/IpSecSpiResponse;->status:I
Landroid/net/IpSecSpiResponse;->TAG:Ljava/lang/String;
Landroid/net/IpSecTransform$Builder;->buildTunnelModeTransform(Ljava/net/InetAddress;Landroid/net/IpSecManager$SecurityParameterIndex;)Landroid/net/IpSecTransform;
Landroid/net/IpSecTransform$Builder;->mConfig:Landroid/net/IpSecConfig;
Landroid/net/IpSecTransform$Builder;->mContext:Landroid/content/Context;
Landroid/net/IpSecTransform$NattKeepaliveCallback;-><init>()V
Landroid/net/IpSecTransform$NattKeepaliveCallback;->ERROR_HARDWARE_ERROR:I
Landroid/net/IpSecTransform$NattKeepaliveCallback;->ERROR_HARDWARE_UNSUPPORTED:I
Landroid/net/IpSecTransform$NattKeepaliveCallback;->ERROR_INVALID_NETWORK:I
Landroid/net/IpSecTransform$NattKeepaliveCallback;->onError(I)V
Landroid/net/IpSecTransform$NattKeepaliveCallback;->onStarted()V
Landroid/net/IpSecTransform$NattKeepaliveCallback;->onStopped()V
Landroid/net/IpSecTransform;-><init>(Landroid/content/Context;Landroid/net/IpSecConfig;)V
Landroid/net/IpSecTransform;->activate()Landroid/net/IpSecTransform;
Landroid/net/IpSecTransform;->checkResultStatus(I)V
Landroid/net/IpSecTransform;->ENCAP_ESPINUDP:I
Landroid/net/IpSecTransform;->ENCAP_ESPINUDP_NON_IKE:I
Landroid/net/IpSecTransform;->ENCAP_NONE:I
Landroid/net/IpSecTransform;->equals(Landroid/net/IpSecTransform;Landroid/net/IpSecTransform;)Z
Landroid/net/IpSecTransform;->getConfig()Landroid/net/IpSecConfig;
Landroid/net/IpSecTransform;->getIpSecService()Landroid/net/IIpSecService;
Landroid/net/IpSecTransform;->getResourceId()I
Landroid/net/IpSecTransform;->mCallbackHandler:Landroid/os/Handler;
Landroid/net/IpSecTransform;->mCloseGuard:Ldalvik/system/CloseGuard;
Landroid/net/IpSecTransform;->mConfig:Landroid/net/IpSecConfig;
Landroid/net/IpSecTransform;->mContext:Landroid/content/Context;
Landroid/net/IpSecTransform;->mKeepalive:Landroid/net/ConnectivityManager$PacketKeepalive;
Landroid/net/IpSecTransform;->mKeepaliveCallback:Landroid/net/ConnectivityManager$PacketKeepaliveCallback;
Landroid/net/IpSecTransform;->MODE_TRANSPORT:I
Landroid/net/IpSecTransform;->MODE_TUNNEL:I
Landroid/net/IpSecTransform;->mResourceId:I
Landroid/net/IpSecTransform;->mUserKeepaliveCallback:Landroid/net/IpSecTransform$NattKeepaliveCallback;
Landroid/net/IpSecTransform;->startNattKeepalive(Landroid/net/IpSecTransform$NattKeepaliveCallback;ILandroid/os/Handler;)V
Landroid/net/IpSecTransform;->stopNattKeepalive()V
Landroid/net/IpSecTransform;->TAG:Ljava/lang/String;
Landroid/net/IpSecTransformResponse;-><init>(I)V
Landroid/net/IpSecTransformResponse;-><init>(II)V
Landroid/net/IpSecTransformResponse;-><init>(Landroid/os/Parcel;)V
Landroid/net/IpSecTransformResponse;->CREATOR:Landroid/os/Parcelable$Creator;
Landroid/net/IpSecTransformResponse;->resourceId:I
Landroid/net/IpSecTransformResponse;->status:I
Landroid/net/IpSecTransformResponse;->TAG:Ljava/lang/String;
Landroid/net/IpSecTunnelInterfaceResponse;-><init>(I)V
Landroid/net/IpSecTunnelInterfaceResponse;-><init>(IILjava/lang/String;)V
Landroid/net/IpSecTunnelInterfaceResponse;-><init>(Landroid/os/Parcel;)V
Landroid/net/IpSecTunnelInterfaceResponse;->CREATOR:Landroid/os/Parcelable$Creator;
Landroid/net/IpSecTunnelInterfaceResponse;->interfaceName:Ljava/lang/String;
Landroid/net/IpSecTunnelInterfaceResponse;->resourceId:I
Landroid/net/IpSecTunnelInterfaceResponse;->status:I
Landroid/net/IpSecTunnelInterfaceResponse;->TAG:Ljava/lang/String;
Landroid/net/IpSecUdpEncapResponse;-><init>(I)V
Landroid/net/IpSecUdpEncapResponse;-><init>(IIILjava/io/FileDescriptor;)V
Landroid/net/IpSecUdpEncapResponse;-><init>(Landroid/os/Parcel;)V
Landroid/net/IpSecUdpEncapResponse;->CREATOR:Landroid/os/Parcelable$Creator;
Landroid/net/IpSecUdpEncapResponse;->fileDescriptor:Landroid/os/ParcelFileDescriptor;
Landroid/net/IpSecUdpEncapResponse;->port:I
Landroid/net/IpSecUdpEncapResponse;->resourceId:I
Landroid/net/IpSecUdpEncapResponse;->status:I
Landroid/net/IpSecUdpEncapResponse;->TAG:Ljava/lang/String;
Landroid/net/ITetheringStatsProvider$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/net/ITetheringStatsProvider$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
Landroid/net/ITetheringStatsProvider$Stub$Proxy;->getTetherStats(I)Landroid/net/NetworkStats;

69
core/api/current.txt
View File

@ -25231,75 +25231,6 @@ package android.net {
method @NonNull public android.net.Ikev2VpnProfile.Builder setRequiresInternetValidation(boolean);
}
public final class IpSecAlgorithm implements android.os.Parcelable {
ctor public IpSecAlgorithm(@NonNull String, @NonNull byte[]);
ctor public IpSecAlgorithm(@NonNull String, @NonNull byte[], int);
method public int describeContents();
method @NonNull public byte[] getKey();
method @NonNull public String getName();
method @NonNull public static java.util.Set<java.lang.String> getSupportedAlgorithms();
method public int getTruncationLengthBits();
method public void writeToParcel(android.os.Parcel, int);
field public static final String AUTH_AES_CMAC = "cmac(aes)";
field public static final String AUTH_AES_XCBC = "xcbc(aes)";
field public static final String AUTH_CRYPT_AES_GCM = "rfc4106(gcm(aes))";
field public static final String AUTH_CRYPT_CHACHA20_POLY1305 = "rfc7539esp(chacha20,poly1305)";
field public static final String AUTH_HMAC_MD5 = "hmac(md5)";
field public static final String AUTH_HMAC_SHA1 = "hmac(sha1)";
field public static final String AUTH_HMAC_SHA256 = "hmac(sha256)";
field public static final String AUTH_HMAC_SHA384 = "hmac(sha384)";
field public static final String AUTH_HMAC_SHA512 = "hmac(sha512)";
field @NonNull public static final android.os.Parcelable.Creator<android.net.IpSecAlgorithm> CREATOR;
field public static final String CRYPT_AES_CBC = "cbc(aes)";
field public static final String CRYPT_AES_CTR = "rfc3686(ctr(aes))";
}
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;
method public void applyTransportModeTransform(@NonNull java.net.DatagramSocket, int, @NonNull android.net.IpSecTransform) throws java.io.IOException;
method public void applyTransportModeTransform(@NonNull java.io.FileDescriptor, int, @NonNull android.net.IpSecTransform) throws java.io.IOException;
method @NonNull public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket(int) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;
method @NonNull public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket() throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;
method public void removeTransportModeTransforms(@NonNull java.net.Socket) throws java.io.IOException;
method public void removeTransportModeTransforms(@NonNull java.net.DatagramSocket) throws java.io.IOException;
method public void removeTransportModeTransforms(@NonNull java.io.FileDescriptor) throws java.io.IOException;
field public static final int DIRECTION_IN = 0; // 0x0
field public static final int DIRECTION_OUT = 1; // 0x1
}
public static final class IpSecManager.ResourceUnavailableException extends android.util.AndroidException {
}
public static final class IpSecManager.SecurityParameterIndex implements java.lang.AutoCloseable {
method public void close();
method public int getSpi();
}
public static final class IpSecManager.SpiUnavailableException extends android.util.AndroidException {
method public int getSpi();
}
public static final class IpSecManager.UdpEncapsulationSocket implements java.lang.AutoCloseable {
method public void close() throws java.io.IOException;
method public java.io.FileDescriptor getFileDescriptor();
method public int getPort();
}
public final class IpSecTransform implements java.lang.AutoCloseable {
method public void close();
}
public static class IpSecTransform.Builder {
ctor public IpSecTransform.Builder(@NonNull android.content.Context);
method @NonNull public android.net.IpSecTransform buildTransportModeTransform(@NonNull java.net.InetAddress, @NonNull android.net.IpSecManager.SecurityParameterIndex) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;
method @NonNull public android.net.IpSecTransform.Builder setAuthenticatedEncryption(@NonNull android.net.IpSecAlgorithm);
method @NonNull public android.net.IpSecTransform.Builder setAuthentication(@NonNull android.net.IpSecAlgorithm);
method @NonNull public android.net.IpSecTransform.Builder setEncryption(@NonNull android.net.IpSecAlgorithm);
method @NonNull public android.net.IpSecTransform.Builder setIpv4Encapsulation(@NonNull android.net.IpSecManager.UdpEncapsulationSocket, int);
}
public class LocalServerSocket implements java.io.Closeable {
ctor public LocalServerSocket(String) throws java.io.IOException;
ctor public LocalServerSocket(java.io.FileDescriptor) throws java.io.IOException;

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

@ -226,14 +226,6 @@ package android.net {
field @NonNull public static final android.os.Parcelable.Creator<android.net.EthernetNetworkSpecifier> CREATOR;
}
public class IpSecManager {
field public static final int DIRECTION_FWD = 2; // 0x2
}
public static final class IpSecManager.UdpEncapsulationSocket implements java.lang.AutoCloseable {
method public int getResourceId();
}
public class LocalSocket implements java.io.Closeable {
ctor public LocalSocket(@NonNull java.io.FileDescriptor);
}

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

@ -7054,23 +7054,6 @@ package android.net {
field @NonNull public static final android.os.Parcelable.Creator<android.net.EthernetNetworkUpdateRequest> CREATOR;
}
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;
}
public static final class IpSecManager.IpSecTunnelInterface implements java.lang.AutoCloseable {
method @RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS) public void addAddress(@NonNull java.net.InetAddress, int) throws java.io.IOException;
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 {
method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS) public android.net.IpSecTransform buildTunnelModeTransform(@NonNull java.net.InetAddress, @NonNull android.net.IpSecManager.SecurityParameterIndex) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;
}
public final class MatchAllNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
ctor public MatchAllNetworkSpecifier();
method public int describeContents();

8
core/api/system-lint-baseline.txt
View File

@ -1,12 +1,6 @@
// Baseline format: 1.0
ArrayReturn: android.view.contentcapture.ViewNode#getAutofillOptions():
BuilderSetStyle: android.net.IpSecTransform.Builder#buildTunnelModeTransform(java.net.InetAddress, android.net.IpSecManager.SecurityParameterIndex):
Builder methods names should use setFoo() / addFoo() / clearFoo() style: method android.net.IpSecTransform.Builder.buildTunnelModeTransform(java.net.InetAddress,android.net.IpSecManager.SecurityParameterIndex)
ExecutorRegistration: android.media.MediaPlayer#setOnRtpRxNoticeListener(android.content.Context, android.media.MediaPlayer.OnRtpRxNoticeListener, android.os.Handler):
Registration methods should have overload that accepts delivery Executor: `setOnRtpRxNoticeListener`
@ -15,8 +9,6 @@ GenericException: android.app.prediction.AppPredictor#finalize():
GenericException: android.hardware.location.ContextHubClient#finalize():
GenericException: android.net.IpSecManager.IpSecTunnelInterface#finalize():
GenericException: android.service.autofill.augmented.FillWindow#finalize():

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

@ -1577,10 +1577,6 @@ package android.net {
method public void setIncludeTestInterfaces(boolean);
}
public class IpSecManager {
field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0
}
public class NetworkPolicyManager {
method public boolean getRestrictBackground();
method @RequiresPermission(android.Manifest.permission.OBSERVE_NETWORK_POLICY) public boolean isUidNetworkingBlocked(int, boolean);

11
core/java/android/app/SystemServiceRegistry.java
View File

@ -128,12 +128,10 @@ import android.net.ConnectivityFrameworkInitializer;
import android.net.ConnectivityFrameworkInitializerTiramisu;
import android.net.EthernetManager;
import android.net.IEthernetManager;
import android.net.IIpSecService;
import android.net.INetworkPolicyManager;
import android.net.INetworkStatsService;
import android.net.IPacProxyManager;
import android.net.IVpnManager;
import android.net.IpSecManager;
import android.net.NetworkPolicyManager;
import android.net.NetworkScoreManager;
import android.net.NetworkWatchlistManager;
@ -420,15 +418,6 @@ public final class SystemServiceRegistry {
return new VcnManager(ctx, service);
}});
registerService(Context.IPSEC_SERVICE, IpSecManager.class,
new CachedServiceFetcher<IpSecManager>() {
@Override
public IpSecManager createService(ContextImpl ctx) throws ServiceNotFoundException {
IBinder b = ServiceManager.getService(Context.IPSEC_SERVICE);
IIpSecService service = IIpSecService.Stub.asInterface(b);
return new IpSecManager(ctx, service);
}});
registerService(Context.COUNTRY_DETECTOR, CountryDetector.class,
new StaticServiceFetcher<CountryDetector>() {
@Override

2
packages/ConnectivityT/framework-t/Android.bp
View File

@ -158,7 +158,6 @@ filegroup {
name: "framework-connectivity-tiramisu-sources",
srcs: [
":framework-connectivity-ethernet-sources",
":framework-connectivity-ipsec-sources",
":framework-connectivity-netstats-sources",
],
visibility: ["//frameworks/base"],
@ -167,6 +166,7 @@ filegroup {
filegroup {
name: "framework-connectivity-tiramisu-updatable-sources",
srcs: [
":framework-connectivity-ipsec-sources",
":framework-connectivity-nsd-sources",
":framework-connectivity-tiramisu-internal-sources",
],

9
packages/ConnectivityT/framework-t/src/android/net/ConnectivityFrameworkInitializerTiramisu.java
View File

@ -48,5 +48,14 @@ public final class ConnectivityFrameworkInitializerTiramisu {
return new NsdManager(context, service);
}
);
SystemServiceRegistry.registerContextAwareService(
Context.IPSEC_SERVICE,
IpSecManager.class,
(context, serviceBinder) -> {
IIpSecService service = IIpSecService.Stub.asInterface(serviceBinder);
return new IpSecManager(context, service);
}
);
}
}

2
packages/ConnectivityT/service/Android.bp
View File

@ -88,7 +88,6 @@ filegroup {
name: "services.connectivity-tiramisu-sources",
srcs: [
":services.connectivity-ethernet-sources",
":services.connectivity-ipsec-sources",
":services.connectivity-netstats-sources",
],
path: "src",
@ -98,6 +97,7 @@ filegroup {
filegroup {
name: "services.connectivity-tiramisu-updatable-sources",
srcs: [
":services.connectivity-ipsec-sources",
":services.connectivity-nsd-sources",
],
path: "src",

29
packages/ConnectivityT/service/src/com/android/server/IpSecService.java
View File

@ -1008,16 +1008,10 @@ public class IpSecService extends IIpSecService.Stub {
*
* @param context Binder context for this service
*/
private IpSecService(Context context) {
public IpSecService(Context context) {
this(context, new Dependencies());
}
static IpSecService create(Context context)
throws InterruptedException {
final IpSecService service = new IpSecService(context);
return service;
}
@NonNull
private AppOpsManager getAppOpsManager() {
AppOpsManager appOps = (AppOpsManager) mContext.getSystemService(Context.APP_OPS_SERVICE);
@ -1054,26 +1048,6 @@ public class IpSecService extends IIpSecService.Stub {
}
}
/** Called by system server when system is ready. */
public void systemReady() {
if (isNetdAlive()) {
Log.d(TAG, "IpSecService is ready");
} else {
Log.wtf(TAG, "IpSecService not ready: failed to connect to NetD Native Service!");
}
}
synchronized boolean isNetdAlive() {
try {
if (mNetd == null) {
return false;
}
return mNetd.isAlive();
} catch (RemoteException re) {
return false;
}
}
/**
* Checks that the provided InetAddress is valid for use in an IPsec SA. The address must not be
* a wildcard address and must be in a numeric form such as 1.2.3.4 or 2001::1.
@ -1896,7 +1870,6 @@ public class IpSecService extends IIpSecService.Stub {
mContext.enforceCallingOrSelfPermission(DUMP, TAG);
pw.println("IpSecService dump:");
pw.println("NetdNativeService Connection: " + (isNetdAlive() ? "alive" : "dead"));
pw.println();
pw.println("mUserResourceTracker:");

21
services/java/com/android/server/SystemServer.java
View File

@ -1334,7 +1334,6 @@ public final class SystemServer implements Dumpable {
DynamicSystemService dynamicSystem = null;
IStorageManager storageManager = null;
NetworkManagementService networkManagement = null;
IpSecService ipSecService = null;
VpnManagerService vpnManager = null;
VcnManagementService vcnManagement = null;
NetworkStatsService networkStats = null;
@ -1806,16 +1805,6 @@ public final class SystemServer implements Dumpable {
}
t.traceEnd();
t.traceBegin("StartIpSecService");
try {
ipSecService = IpSecService.create(context);
ServiceManager.addService(Context.IPSEC_SERVICE, ipSecService);
} catch (Throwable e) {
reportWtf("starting IpSec Service", e);
}
t.traceEnd();
t.traceBegin("StartFontManagerService");
mSystemServiceManager.startService(new FontManagerService.Lifecycle(context, safeMode));
t.traceEnd();
@ -2667,7 +2656,6 @@ public final class SystemServer implements Dumpable {
final TelephonyRegistry telephonyRegistryF = telephonyRegistry;
final MediaRouterService mediaRouterF = mediaRouter;
final MmsServiceBroker mmsServiceF = mmsService;
final IpSecService ipSecServiceF = ipSecService;
final VpnManagerService vpnManagerF = vpnManager;
final VcnManagementService vcnManagementF = vcnManagement;
final WindowManagerService windowManagerF = wm;
@ -2757,15 +2745,6 @@ public final class SystemServer implements Dumpable {
.networkScoreAndNetworkManagementServiceReady();
}
t.traceEnd();
t.traceBegin("MakeIpSecServiceReady");
try {
if (ipSecServiceF != null) {
ipSecServiceF.systemReady();
}
} catch (Throwable e) {
reportWtf("making IpSec Service ready", e);
}
t.traceEnd();
t.traceBegin("MakeNetworkStatsServiceReady");
try {
if (networkStatsF != null) {