Merge UP1A.230905.019tmp_amf_298295554

Merged-In: Ibc0f0fb8920046745795ca7d7c606510a362c459
Change-Id: I81b0eaf7812ad1c5abd350951b4c82f208f713f6

15 files changed, 55 insertions, 6 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index fa4aa48..df07964 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,14 +1,14 @@
 drops {
   android_build_drop {
-    build_id: "T1005166"
+    build_id: "T1007284"
     target: "train_build"
-    source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.ipsec/sdk/ipsec-module-sdk-current.zip"
+    source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.ipsec/sdk/ipsec-module-sdk-current.zip"
   }
   dest_file: "current/current.zip"
   version: ""
   version_group: ""
   git_project: "platform/prebuilts/module_sdk/IPsec"
-  git_branch: "tm-qpr-dev"
+  git_branch: "udc-dev"
   transform: TRANSFORM_UNZIP
   transform_options {
   }
diff --git a/current/Android.bp b/current/Android.bp
index e78608f..eaa0260 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -1,5 +1,11 @@
 // This is auto-generated. DO NOT EDIT.
 
+// blueprint rules added by vendor/google/build/mainline_modules_sdks.py
+// to support coexistence.
+blueprint_package_includes {
+    match_all: ["com.android.mainline"]
+}
+
 package {
     // A default list here prevents the license LSC from adding its own list which would
     // be unnecessary as every module in the sdk already has its own licenses property.
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index 8843eb0..9db51ce 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -210,6 +210,7 @@ Landroid/net/ipsec/ike/IkeSessionParams$IkeAuthPskConfig;->equals(Ljava/lang/Obj
 Landroid/net/ipsec/ike/IkeSessionParams$IkeAuthPskConfig;->getPsk()[B,public-api,sdk,system-api,test-api
 Landroid/net/ipsec/ike/IkeSessionParams$IkeAuthPskConfig;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/net/ipsec/ike/IkeSessionParams;->IKE_OPTION_ACCEPT_ANY_REMOTE_ID:I,public-api,sdk,system-api,test-api
+Landroid/net/ipsec/ike/IkeSessionParams;->IKE_OPTION_AUTOMATIC_KEEPALIVE_ON_OFF:I,sdk,system-api,test-api
 Landroid/net/ipsec/ike/IkeSessionParams;->IKE_OPTION_EAP_ONLY_AUTH:I,public-api,sdk,system-api,test-api
 Landroid/net/ipsec/ike/IkeSessionParams;->IKE_OPTION_FORCE_PORT_4500:I,public-api,sdk,system-api,test-api
 Landroid/net/ipsec/ike/IkeSessionParams;->IKE_OPTION_INITIAL_CONTACT:I,public-api,sdk,system-api,test-api
@@ -386,6 +387,7 @@ Lcom/android/internal/net/eap/message/simaka/EapSimAkaAttribute$AtNotification;-
 Lcom/android/internal/net/eap/statemachine/EapSimMethodStateMachine$ChallengeState$RandChallengeResult;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/eap/statemachine/EapSimMethodStateMachine$ChallengeState$RandChallengeResult;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$CreateChildLocalCreateBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$DeleteResponderBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$ExceptionHandler$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
@@ -400,7 +402,7 @@ Lcom/android/internal/net/ipsec/ike/IkeLocalRequestScheduler$LocalRequestCompara
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeAuthBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeAuthFirstAndLastExchangeBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$DeleteIkeLocalDelete$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$DeleteResponderBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$ExceptionHandler$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
@@ -427,6 +429,7 @@ Lcom/android/internal/net/ipsec/ike/SaRecord;->finalize()V,core-platform-api,pub
 Lcom/android/internal/net/ipsec/ike/ike3gpp/Ike3gppExchangeBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/ike3gpp/Ike3gppExtensionExchange;->close()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl$MySocketKeepaliveCb;->onError(I)V,public-api,sdk,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl$MySocketKeepaliveCb;->onStopped()V,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/message/IkeConfigPayload$ConfigAttribute;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/message/IkeConfigPayload$ConfigAttribute;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/message/IkeConfigPayload$ConfigAttributeAppVersion;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
@@ -483,6 +486,10 @@ Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload$PrfTransform;->hashCode
 Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload$PrfTransform;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload$Proposal;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onAvailable(Landroid/net/Network;)V,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,sdk,system-api,test-api
@@ -508,3 +515,4 @@ Lcom/android/internal/net/ipsec/ike/utils/StateMachine;->toString()Ljava/lang/St
 Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->onAlarm()V,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/vcn/util/PersistableBundleUtils$PersistableBundleWrapper;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/vcn/util/PersistableBundleUtils$PersistableBundleWrapper;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/internal/net/vcn/util/PersistableBundleUtils$PersistableBundleWrapper;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index e128c85..a719631 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -210,6 +210,7 @@ Landroid/net/ipsec/ike/IkeSessionParams$IkeAuthPskConfig;->equals(Ljava/lang/Obj
 Landroid/net/ipsec/ike/IkeSessionParams$IkeAuthPskConfig;->getPsk()[B,public-api,system-api,test-api
 Landroid/net/ipsec/ike/IkeSessionParams$IkeAuthPskConfig;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/net/ipsec/ike/IkeSessionParams;->IKE_OPTION_ACCEPT_ANY_REMOTE_ID:I,public-api,system-api,test-api
+Landroid/net/ipsec/ike/IkeSessionParams;->IKE_OPTION_AUTOMATIC_KEEPALIVE_ON_OFF:I,system-api,test-api
 Landroid/net/ipsec/ike/IkeSessionParams;->IKE_OPTION_EAP_ONLY_AUTH:I,public-api,system-api,test-api
 Landroid/net/ipsec/ike/IkeSessionParams;->IKE_OPTION_FORCE_PORT_4500:I,public-api,system-api,test-api
 Landroid/net/ipsec/ike/IkeSessionParams;->IKE_OPTION_INITIAL_CONTACT:I,public-api,system-api,test-api
@@ -386,6 +387,7 @@ Lcom/android/internal/net/eap/message/simaka/EapSimAkaAttribute$AtNotification;-
 Lcom/android/internal/net/eap/statemachine/EapSimMethodStateMachine$ChallengeState$RandChallengeResult;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/eap/statemachine/EapSimMethodStateMachine$ChallengeState$RandChallengeResult;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$CreateChildLocalCreateBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$DeleteResponderBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$ExceptionHandler$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
@@ -400,7 +402,7 @@ Lcom/android/internal/net/ipsec/ike/IkeLocalRequestScheduler$LocalRequestCompara
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeAuthBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeAuthFirstAndLastExchangeBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$DeleteIkeLocalDelete$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$DeleteResponderBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$ExceptionHandler$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
@@ -427,6 +429,7 @@ Lcom/android/internal/net/ipsec/ike/SaRecord;->finalize()V,core-platform-api,pub
 Lcom/android/internal/net/ipsec/ike/ike3gpp/Ike3gppExchangeBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/ike3gpp/Ike3gppExtensionExchange;->close()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl$MySocketKeepaliveCb;->onError(I)V,public-api,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl$MySocketKeepaliveCb;->onStopped()V,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/message/IkeConfigPayload$ConfigAttribute;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/message/IkeConfigPayload$ConfigAttribute;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/message/IkeConfigPayload$ConfigAttributeAppVersion;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
@@ -483,6 +486,10 @@ Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload$PrfTransform;->hashCode
 Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload$PrfTransform;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload$Proposal;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onAvailable(Landroid/net/Network;)V,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,system-api,test-api
@@ -508,3 +515,4 @@ Lcom/android/internal/net/ipsec/ike/utils/StateMachine;->toString()Ljava/lang/St
 Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->onAlarm()V,public-api,system-api,test-api
 Lcom/android/internal/net/vcn/util/PersistableBundleUtils$PersistableBundleWrapper;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/vcn/util/PersistableBundleUtils$PersistableBundleWrapper;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Lcom/android/internal/net/vcn/util/PersistableBundleUtils$PersistableBundleWrapper;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
diff --git a/current/sdk_library/module-lib/android.net.ipsec.ike-stubs.jar b/current/sdk_library/module-lib/android.net.ipsec.ike-stubs.jar
index 621137a..a2eb44f 100644
--- a/current/sdk_library/module-lib/android.net.ipsec.ike-stubs.jar
+++ b/current/sdk_library/module-lib/android.net.ipsec.ike-stubs.jar
diff --git a/current/sdk_library/module-lib/android.net.ipsec.ike.srcjar b/current/sdk_library/module-lib/android.net.ipsec.ike.srcjar
index bc5112e..763f794 100644
--- a/current/sdk_library/module-lib/android.net.ipsec.ike.srcjar
+++ b/current/sdk_library/module-lib/android.net.ipsec.ike.srcjar
diff --git a/current/sdk_library/module-lib/android.net.ipsec.ike.txt b/current/sdk_library/module-lib/android.net.ipsec.ike.txt
index d802177..597be30 100644
--- a/current/sdk_library/module-lib/android.net.ipsec.ike.txt
+++ b/current/sdk_library/module-lib/android.net.ipsec.ike.txt
@@ -1 +1,27 @@
 // Signature format: 2.0
+package android.net.ipsec.ike {
+
+  public final class IkeSession implements java.lang.AutoCloseable {
+    method public void setNetwork(@NonNull android.net.Network, int, int, @IntRange(from=0xa, to=0xe10) int);
+    method public void setUnderpinnedNetwork(@NonNull android.net.Network);
+  }
+
+  public final class IkeSessionParams {
+    method public int getEncapType();
+    method public int getIpVersion();
+    field public static final int ESP_ENCAP_TYPE_AUTO = 0; // 0x0
+    field public static final int ESP_ENCAP_TYPE_NONE = -1; // 0xffffffff
+    field public static final int ESP_ENCAP_TYPE_UDP = 17; // 0x11
+    field public static final int ESP_IP_VERSION_AUTO = 0; // 0x0
+    field public static final int ESP_IP_VERSION_IPV4 = 4; // 0x4
+    field public static final int ESP_IP_VERSION_IPV6 = 6; // 0x6
+    field public static final int NATT_KEEPALIVE_INTERVAL_AUTO = -1; // 0xffffffff
+  }
+
+  public static final class IkeSessionParams.Builder {
+    method @NonNull public android.net.ipsec.ike.IkeSessionParams.Builder setEncapType(int);
+    method @NonNull public android.net.ipsec.ike.IkeSessionParams.Builder setIpVersion(int);
+  }
+
+}
+
diff --git a/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip b/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip
index 64096c4..3560433 100644
--- a/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip
+++ b/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip
diff --git a/current/sdk_library/public/android.net.ipsec.ike-stubs.jar b/current/sdk_library/public/android.net.ipsec.ike-stubs.jar
index 5a347bc..33de10e 100644
--- a/current/sdk_library/public/android.net.ipsec.ike-stubs.jar
+++ b/current/sdk_library/public/android.net.ipsec.ike-stubs.jar
diff --git a/current/sdk_library/public/android.net.ipsec.ike.srcjar b/current/sdk_library/public/android.net.ipsec.ike.srcjar
index eac8fd1..6aa5a3e 100644
--- a/current/sdk_library/public/android.net.ipsec.ike.srcjar
+++ b/current/sdk_library/public/android.net.ipsec.ike.srcjar
diff --git a/current/sdk_library/system/android.net.ipsec.ike-stubs.jar b/current/sdk_library/system/android.net.ipsec.ike-stubs.jar
index 621137a..605c9bd 100644
--- a/current/sdk_library/system/android.net.ipsec.ike-stubs.jar
+++ b/current/sdk_library/system/android.net.ipsec.ike-stubs.jar
diff --git a/current/sdk_library/system/android.net.ipsec.ike.srcjar b/current/sdk_library/system/android.net.ipsec.ike.srcjar
index bc5112e..d961ec0 100644
--- a/current/sdk_library/system/android.net.ipsec.ike.srcjar
+++ b/current/sdk_library/system/android.net.ipsec.ike.srcjar
diff --git a/current/sdk_library/system/android.net.ipsec.ike.txt b/current/sdk_library/system/android.net.ipsec.ike.txt
index f82978d..f354230 100644
--- a/current/sdk_library/system/android.net.ipsec.ike.txt
+++ b/current/sdk_library/system/android.net.ipsec.ike.txt
@@ -65,6 +65,7 @@ package android.net.ipsec.ike {
     method @IntRange(from=0x0, to=0x3f) public int getDscp();
     method @Nullable public android.net.ipsec.ike.ike3gpp.Ike3gppExtension getIke3gppExtension();
     method @Deprecated @NonNull public java.util.List<android.net.ipsec.ike.IkeSaProposal> getSaProposals();
+    field public static final int IKE_OPTION_AUTOMATIC_KEEPALIVE_ON_OFF = 8; // 0x8
     field public static final int IKE_OPTION_REKEY_MOBILITY = 5; // 0x5
   }
 
diff --git a/current/sdk_library/system/android.net.ipsec.ike_annotations.zip b/current/sdk_library/system/android.net.ipsec.ike_annotations.zip
index 64096c4..96e3825 100644
--- a/current/sdk_library/system/android.net.ipsec.ike_annotations.zip
+++ b/current/sdk_library/system/android.net.ipsec.ike_annotations.zip
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 5c0f46a..622b3bf 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-9279848
\ No newline at end of file
+10484568
\ No newline at end of file