diff options
| author | Nathan Harold <nharold@google.com> | 2017-09-26 22:11:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-26 22:11:58 +0000 |
| commit | f434a6d308b8b2f25bd786d2118a8487d3ddd9b9 (patch) | |
| tree | 383c63a3a2a917e5c9e5dec176891d699a1ad80d /core/java/android | |
| parent | a2161c5ccb4a6f24a6c53d1623624d5c57073558 (diff) | |
| parent | b72821747cd8cfa9bcaff7f11247ebfce3255fbf (diff) | |
Re-Enable Starting of the IpSecService
am: b72821747c
Change-Id: I1f64aa2fdf1cce6dea91427eda65c4b8ee6f6b02
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/IpSecAlgorithm.java | 2 | ||||
| -rw-r--r-- | core/java/android/net/IpSecManager.java | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/net/IpSecAlgorithm.java b/core/java/android/net/IpSecAlgorithm.java index 5ae340036147..7e956bf38831 100644 --- a/core/java/android/net/IpSecAlgorithm.java +++ b/core/java/android/net/IpSecAlgorithm.java @@ -19,7 +19,9 @@ import android.annotation.StringDef; import android.os.Build; import android.os.Parcel; import android.os.Parcelable; + import com.android.internal.util.HexDump; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/core/java/android/net/IpSecManager.java b/core/java/android/net/IpSecManager.java index 2f791e151b08..00cacbcd713f 100644 --- a/core/java/android/net/IpSecManager.java +++ b/core/java/android/net/IpSecManager.java @@ -25,7 +25,9 @@ import android.os.ParcelFileDescriptor; import android.os.RemoteException; import android.util.AndroidException; import android.util.Log; + import dalvik.system.CloseGuard; + import java.io.FileDescriptor; import java.io.IOException; import java.net.DatagramSocket; |