From 81f54633f012a35b36a9928e99e1d9c1bb896e24 Mon Sep 17 00:00:00 2001 From: Nathan Harold Date: Mon, 11 Sep 2017 19:50:19 -0700 Subject: [PATCH] Re-Enable Starting of the IpSecService This reverts commit 41004ff4113dc9175c993638a47af602af6d8a98. Bug: 64800246 Test: compilation Change-Id: I4f5e3cd23001b9d94b3f6dc9fcfe731a90650e6e --- core/java/android/net/IpSecAlgorithm.java | 2 ++ core/java/android/net/IpSecManager.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/core/java/android/net/IpSecAlgorithm.java b/core/java/android/net/IpSecAlgorithm.java index 5ae3400361..7e956bf388 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 2f791e151b..00cacbcd71 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;