Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b077f6ab authored by Nathan Harold's avatar Nathan Harold Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'ipsec-svc-pick' into oc-dev 

* changes:
  Fix Log Traces for IpSecService
  SystemServer: fix StartIpSecService trace and log
  Add Initial IPsec APIs to IpSecService
  IpSecManager and IpSecTransform API Cleanup
  Change reserveSecurityParameterIndex() to take a remoteAddress
  Add a Skeleton IpSecService
parents fade5359 a8a74e25

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/net/IEthernetManager.aidl \

	core/java/android/net/IEthernetServiceListener.aidl \

	core/java/android/net/INetdEventCallback.aidl \

	core/java/android/net/IIpSecService.aidl \

	core/java/android/net/INetworkManagementEventObserver.aidl \

	core/java/android/net/INetworkPolicyListener.aidl \

	core/java/android/net/INetworkPolicyManager.aidl \

api/current.txt

+1 −2
Original line number Diff line number Diff line
@@ -25557,7 +25557,7 @@ package android.net { 
    method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket() throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;

    method public void removeTransportModeTransform(java.net.Socket, android.net.IpSecTransform);

    method public void removeTransportModeTransform(java.net.DatagramSocket, android.net.IpSecTransform);

    method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;

    method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;

    field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0

  }










@@ -25591,7 +25591,6 @@ package android.net {













    method public android.net.IpSecTransform.Builder setAuthentication(int, android.net.IpSecAlgorithm);















    method public android.net.IpSecTransform.Builder setEncryption(int, android.net.IpSecAlgorithm);















    method public android.net.IpSecTransform.Builder setIpv4Encapsulation(android.net.IpSecManager.UdpEncapsulationSocket, int);













    method public android.net.IpSecTransform.Builder setSpi(int, int);















    method public android.net.IpSecTransform.Builder setSpi(int, android.net.IpSecManager.SecurityParameterIndex);















  }







































api/system-current.txt



+1
−5




























Original line number
Diff line number
Diff line








@@ -27718,13 +27718,11 @@ package android.net {













  public final class IpSecManager {















    method public void applyTransportModeTransform(java.net.Socket, android.net.IpSecTransform) throws java.io.IOException;















    method public void applyTransportModeTransform(java.net.DatagramSocket, android.net.IpSecTransform) throws java.io.IOException;













    method public void applyTunnelModeTransform(android.net.Network, android.net.IpSecTransform);















    method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket(int) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;















    method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket() throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;















    method public void removeTransportModeTransform(java.net.Socket, android.net.IpSecTransform);















    method public void removeTransportModeTransform(java.net.DatagramSocket, android.net.IpSecTransform);













    method public void removeTunnelModeTransform(android.net.Network, android.net.IpSecTransform);













    method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;













    method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;















    field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0















  }
























@@ -27755,12 +27753,10 @@ package android.net {













  public static class IpSecTransform.Builder {















    ctor public IpSecTransform.Builder(android.content.Context);















    method public android.net.IpSecTransform buildTransportModeTransform(java.net.InetAddress) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;













    method public android.net.IpSecTransform buildTunnelModeTransform(java.net.InetAddress, java.net.InetAddress);















    method public android.net.IpSecTransform.Builder setAuthentication(int, android.net.IpSecAlgorithm);















    method public android.net.IpSecTransform.Builder setEncryption(int, android.net.IpSecAlgorithm);















    method public android.net.IpSecTransform.Builder setIpv4Encapsulation(android.net.IpSecManager.UdpEncapsulationSocket, int);















    method public android.net.IpSecTransform.Builder setNattKeepalive(int);













    method public android.net.IpSecTransform.Builder setSpi(int, int);















    method public android.net.IpSecTransform.Builder setSpi(int, android.net.IpSecManager.SecurityParameterIndex);















    method public android.net.IpSecTransform.Builder setUnderlyingNetwork(android.net.Network);















  }

























api/test-current.txt



+1
−2




























Original line number
Diff line number
Diff line








@@ -25670,7 +25670,7 @@ package android.net {













    method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket() throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;















    method public void removeTransportModeTransform(java.net.Socket, android.net.IpSecTransform);















    method public void removeTransportModeTransform(java.net.DatagramSocket, android.net.IpSecTransform);













    method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;













    method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;















    field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0















  }
























@@ -25704,7 +25704,6 @@ package android.net {













    method public android.net.IpSecTransform.Builder setAuthentication(int, android.net.IpSecAlgorithm);















    method public android.net.IpSecTransform.Builder setEncryption(int, android.net.IpSecAlgorithm);















    method public android.net.IpSecTransform.Builder setIpv4Encapsulation(android.net.IpSecManager.UdpEncapsulationSocket, int);













    method public android.net.IpSecTransform.Builder setSpi(int, int);















    method public android.net.IpSecTransform.Builder setSpi(int, android.net.IpSecManager.SecurityParameterIndex);















  }







































core/java/android/app/SystemServiceRegistry.java



+11
−0




























Original line number
Diff line number
Diff line








@@ -74,7 +74,9 @@ import android.net.ConnectivityThread;













import android.net.EthernetManager;















import android.net.IConnectivityManager;















import android.net.IEthernetManager;













import android.net.IIpSecService;















import android.net.INetworkPolicyManager;













import android.net.IpSecManager;















import android.net.NetworkPolicyManager;















import android.net.NetworkScoreManager;















import android.net.nsd.INsdManager;










@@ -261,6 +263,15 @@ final class SystemServiceRegistry {













                return new ConnectivityManager(context, service);















            }});





























        registerService(Context.IPSEC_SERVICE, IpSecManager.class,













                new StaticServiceFetcher<IpSecManager>() {













            @Override













            public IpSecManager createService() {













                IBinder b = ServiceManager.getService(Context.IPSEC_SERVICE);













                IIpSecService service = IIpSecService.Stub.asInterface(b);













                return new IpSecManager(service);













            }});





























        registerService(Context.COUNTRY_DETECTOR, CountryDetector.class,















                new StaticServiceFetcher<CountryDetector>() {















            @Override