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

release-request-ccf2fffc-f042-4ff3-9aa0-53d7f927fbf8-for-git_pi-release-4362679 snap-temp-L24900000106498589

Browse Source 
Change-Id: Iaf5d097bdde853a9283f5e058e8adba6b1b5075d
This commit is contained in:
android-build-team Robot
2017-09-27 08:09:14 +00:00
parent 630b8c3f9c 59872858db
commit bdaa569861
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,15 +19,15 @@ import android.annotation.StringDef;
import android.os.Build; import android.os.Build;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import com.android.internal.util.HexDump; import com.android.internal.util.HexDump;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; 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 {

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

@@ -25,7 +25,9 @@ import android.os.ParcelFileDescriptor;
import android.os.RemoteException; import android.os.RemoteException;
import android.util.AndroidException; import android.util.AndroidException;
import android.util.Log; import android.util.Log;
import dalvik.system.CloseGuard; import dalvik.system.CloseGuard;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.IOException; import java.io.IOException;
import java.net.DatagramSocket; import java.net.DatagramSocket;
@@ -36,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";