LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes from topic "re-enable-ipsec"

Browse Source 
am: 61cf7b284e

Change-Id: Ia1d1f3981a9dd1eb8f60631d318211daf135d575
This commit is contained in:
nharold
2017-09-26 22:13:20 +00:00
committed by android-build-merger
parent a246237c74 61cf7b284e
commit 5a77657433
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/IpSecAlgorithm.java
View File

@@ -28,8 +28,6 @@ import java.lang.annotation.RetentionPolicy;
/** /**
* IpSecAlgorithm specifies a single algorithm that can be applied to an IpSec Transform. Refer to * IpSecAlgorithm specifies a single algorithm that can be applied to an IpSec Transform. Refer to
* RFC 4301. * RFC 4301.
*
* @hide
*/ */
public final class IpSecAlgorithm implements Parcelable { public final class IpSecAlgorithm implements Parcelable {

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

@@ -38,7 +38,9 @@ import java.net.Socket;
* This class contains methods for managing IPsec sessions, which will perform kernel-space * This class contains methods for managing IPsec sessions, which will perform kernel-space
* encryption and decryption of socket or Network traffic. * encryption and decryption of socket or Network traffic.
* *
* @hide * <p>An IpSecManager may be obtained by calling {@link
* android.content.Context#getSystemService(String) Context#getSystemService(String)} with {@link
* android.content.Context#IPSEC_SERVICE Context#IPSEC_SERVICE}
*/ */
@SystemService(Context.IPSEC_SERVICE) @SystemService(Context.IPSEC_SERVICE)
public final class IpSecManager { public final class IpSecManager {

5
core/java/android/net/IpSecTransform.java
View File

@@ -26,9 +26,12 @@ import android.os.IBinder;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.util.Log; import android.util.Log;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.Preconditions; import com.android.internal.util.Preconditions;
import dalvik.system.CloseGuard; import dalvik.system.CloseGuard;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
@@ -43,8 +46,6 @@ import java.net.InetAddress;
* *
* <p>An IpSecTransform may either represent a tunnel mode transform that operates on a wide array * <p>An IpSecTransform may either represent a tunnel mode transform that operates on a wide array
* of traffic or may represent a transport mode transform operating on a Socket or Sockets. * of traffic or may represent a transport mode transform operating on a Socket or Sockets.
*
* @hide
*/ */
public final class IpSecTransform implements AutoCloseable { public final class IpSecTransform implements AutoCloseable {
private static final String TAG = "IpSecTransform"; private static final String TAG = "IpSecTransform";