Merge changes from topics "Expose IKE ID, TS & SaProposal", "Expose IKE exception and callback", "Expose IkeManager & IkeSession", "Expose SessionOptions & EapConfig" am: 091e420529

am: bf9172deb4

Change-Id: I7407a74764628feeec04e5730df788e14fe2e5c6

1 files changed, 8 insertions, 0 deletions

diff --git a/api/system-current.txt b/api/system-current.txt
index f90be39e019b..ac8581a83511 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -4448,6 +4448,14 @@ package android.net.ipsec.ike {
     method @NonNull public android.net.ipsec.ike.IkeSaProposal build();
   }
 
+  public final class IkeSession implements java.lang.AutoCloseable {
+    ctor public IkeSession(@NonNull android.content.Context, @NonNull android.net.ipsec.ike.IkeSessionOptions, @NonNull android.net.ipsec.ike.ChildSessionOptions, @NonNull java.util.concurrent.Executor, @NonNull android.net.ipsec.ike.IkeSessionCallback, @NonNull android.net.ipsec.ike.ChildSessionCallback);
+    method public void close();
+    method public void closeChildSession(@NonNull android.net.ipsec.ike.ChildSessionCallback);
+    method public void kill();
+    method public void openChildSession(@NonNull android.net.ipsec.ike.ChildSessionOptions, @NonNull android.net.ipsec.ike.ChildSessionCallback);
+  }
+
   public interface IkeSessionCallback {
     method public void onClosed();
     method public void onClosedExceptionally(@NonNull android.net.ipsec.ike.exceptions.IkeException);