DO NOT MERGE Drop prebuilt files to android source tree.

Android.bp.auto

LICENSE

annotation-flags.csv

all-flags.csv

metadata.csv

index.csv

stub-flags.csv

android.net.ipsec.ike-stubs.jar

android.net.ipsec.ike-removed.txt

android.net.ipsec.ike.srcjar

android.net.ipsec.ike.txt

android.net.ipsec.ike-stubs.jar

android.net.ipsec.ike-removed.txt

android.net.ipsec.ike.srcjar

android.net.ipsec.ike.txt

android.net.ipsec.ike-stubs.jar

android.net.ipsec.ike-removed.txt

android.net.ipsec.ike.srcjar

android.net.ipsec.ike.txt

Built here: ab/7728754

This build IS suitable for public release.

The change is generated with prebuilt drop tool.

Test: presubmit
Bug: 206118939
Change-Id: I88753c3675410e61c48b5122476e4293b496e140

6 files changed, 327 insertions, 76 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index fde13d4..0321ab1 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,6 +1,6 @@
 drops {
   android_build_drop {
-    build_id: "7542407"
+    build_id: "7728754"
     target: "mainline_modules-user"
     source_file: "mainline-sdks/ipsec-module-sdk-current.zip"
   }
@@ -8,6 +8,12 @@ drops {
   version: ""
   version_group: ""
   git_project: "platform/prebuilts/module_sdk/IPsec"
-  git_branch: "sc-dev"
+  git_branch: "sc-v2-dev"
   transform: TRANSFORM_UNZIP
+  transform_options {
+    rename {
+      from_path: "Android.bp"
+      to_path: "Android.bp.auto"
+    }
+  }
 }
diff --git a/current/Android.bp.auto b/current/Android.bp.auto
new file mode 100755
index 0000000..124fb56
--- /dev/null
+++ b/current/Android.bp.auto
@@ -0,0 +1,139 @@
+// This is auto-generated. DO NOT EDIT.
+
+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.
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+prebuilt_bootclasspath_fragment {
+    name: "ipsec-module-sdk_com.android.ipsec-bootclasspath-fragment@current",
+    sdk_member_name: "com.android.ipsec-bootclasspath-fragment",
+    visibility: ["//visibility:public"],
+    apex_available: ["com.android.ipsec"],
+    licenses: ["ipsec-module-sdk_Android-Apache-2.0@current"],
+    contents: ["ipsec-module-sdk_android.net.ipsec.ike@current"],
+    hidden_api: {
+        stub_flags: "hiddenapi/stub-flags.csv",
+        annotation_flags: "hiddenapi/annotation-flags.csv",
+        metadata: "hiddenapi/metadata.csv",
+        index: "hiddenapi/index.csv",
+        all_flags: "hiddenapi/all-flags.csv",
+    },
+}
+
+prebuilt_bootclasspath_fragment {
+    name: "com.android.ipsec-bootclasspath-fragment",
+    prefer: false,
+    visibility: ["//visibility:public"],
+    apex_available: ["com.android.ipsec"],
+    licenses: ["ipsec-module-sdk_Android-Apache-2.0"],
+    contents: ["android.net.ipsec.ike"],
+    hidden_api: {
+        stub_flags: "hiddenapi/stub-flags.csv",
+        annotation_flags: "hiddenapi/annotation-flags.csv",
+        metadata: "hiddenapi/metadata.csv",
+        index: "hiddenapi/index.csv",
+        all_flags: "hiddenapi/all-flags.csv",
+    },
+}
+
+java_sdk_library_import {
+    name: "ipsec-module-sdk_android.net.ipsec.ike@current",
+    sdk_member_name: "android.net.ipsec.ike",
+    visibility: ["//visibility:public"],
+    apex_available: [
+        "com.android.ipsec",
+        "test_com.android.ipsec",
+    ],
+    licenses: ["ipsec-module-sdk_Android-Apache-2.0@current"],
+    shared_library: true,
+    compile_dex: true,
+    permitted_packages: [
+        "com.android.internal.net",
+        "android.net.ipsec.ike",
+        "android.net.eap",
+    ],
+    public: {
+        jars: ["sdk_library/public/android.net.ipsec.ike-stubs.jar"],
+        stub_srcs: ["sdk_library/public/android.net.ipsec.ike.srcjar"],
+        current_api: "sdk_library/public/android.net.ipsec.ike.txt",
+        removed_api: "sdk_library/public/android.net.ipsec.ike-removed.txt",
+        sdk_version: "module_current",
+    },
+    system: {
+        jars: ["sdk_library/system/android.net.ipsec.ike-stubs.jar"],
+        stub_srcs: ["sdk_library/system/android.net.ipsec.ike.srcjar"],
+        current_api: "sdk_library/system/android.net.ipsec.ike.txt",
+        removed_api: "sdk_library/system/android.net.ipsec.ike-removed.txt",
+        sdk_version: "module_current",
+    },
+    module_lib: {
+        jars: ["sdk_library/module-lib/android.net.ipsec.ike-stubs.jar"],
+        stub_srcs: ["sdk_library/module-lib/android.net.ipsec.ike.srcjar"],
+        current_api: "sdk_library/module-lib/android.net.ipsec.ike.txt",
+        removed_api: "sdk_library/module-lib/android.net.ipsec.ike-removed.txt",
+        sdk_version: "module_current",
+    },
+}
+
+java_sdk_library_import {
+    name: "android.net.ipsec.ike",
+    prefer: false,
+    visibility: ["//visibility:public"],
+    apex_available: [
+        "com.android.ipsec",
+        "test_com.android.ipsec",
+    ],
+    licenses: ["ipsec-module-sdk_Android-Apache-2.0"],
+    shared_library: true,
+    compile_dex: true,
+    permitted_packages: [
+        "com.android.internal.net",
+        "android.net.ipsec.ike",
+        "android.net.eap",
+    ],
+    public: {
+        jars: ["sdk_library/public/android.net.ipsec.ike-stubs.jar"],
+        stub_srcs: ["sdk_library/public/android.net.ipsec.ike.srcjar"],
+        current_api: "sdk_library/public/android.net.ipsec.ike.txt",
+        removed_api: "sdk_library/public/android.net.ipsec.ike-removed.txt",
+        sdk_version: "module_current",
+    },
+    system: {
+        jars: ["sdk_library/system/android.net.ipsec.ike-stubs.jar"],
+        stub_srcs: ["sdk_library/system/android.net.ipsec.ike.srcjar"],
+        current_api: "sdk_library/system/android.net.ipsec.ike.txt",
+        removed_api: "sdk_library/system/android.net.ipsec.ike-removed.txt",
+        sdk_version: "module_current",
+    },
+    module_lib: {
+        jars: ["sdk_library/module-lib/android.net.ipsec.ike-stubs.jar"],
+        stub_srcs: ["sdk_library/module-lib/android.net.ipsec.ike.srcjar"],
+        current_api: "sdk_library/module-lib/android.net.ipsec.ike.txt",
+        removed_api: "sdk_library/module-lib/android.net.ipsec.ike-removed.txt",
+        sdk_version: "module_current",
+    },
+}
+
+license {
+    name: "ipsec-module-sdk_Android-Apache-2.0@current",
+    sdk_member_name: "Android-Apache-2.0",
+    visibility: ["//visibility:private"],
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["licenses/build/soong/licenses/LICENSE"],
+}
+
+license {
+    name: "ipsec-module-sdk_Android-Apache-2.0",
+    visibility: ["//visibility:private"],
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["licenses/build/soong/licenses/LICENSE"],
+}
+
+sdk_snapshot {
+    name: "ipsec-module-sdk@current",
+    visibility: ["//visibility:public"],
+    bootclasspath_fragments: ["ipsec-module-sdk_com.android.ipsec-bootclasspath-fragment@current"],
+    java_sdk_libs: ["ipsec-module-sdk_android.net.ipsec.ike@current"],
+}
diff --git a/current/hiddenapi/all-flags.csv b/current/hiddenapi/all-flags.csv
index 71aada2..cbbbf33 100644
--- a/current/hiddenapi/all-flags.csv
+++ b/current/hiddenapi/all-flags.csv
@@ -2083,6 +2083,7 @@ Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine$ExceptionHandler
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine$ExceptionHandlerBase;->enterState()V,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine$ExceptionHandlerBase;->exit()V,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine$ExceptionHandlerBase;->exitState()V,blocked
+Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine$ExceptionHandlerBase;->getCmdStr(I)Ljava/lang/String;,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine$ExceptionHandlerBase;->getCmdString(I)Ljava/lang/String;,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine$ExceptionHandlerBase;->processMessage(Landroid/os/Message;)Z,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine$ExceptionHandlerBase;->processStateMessage(Landroid/os/Message;)Z,blocked
@@ -2092,19 +2093,22 @@ Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;-><init>(Ljava/l
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_CATEGORY_SIZE:I,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_CHILD_LOCAL_REQUEST_BASE:I,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_FORCE_TRANSITION:I,blocked
+Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_GENERIC_BASE:I,blocked
+Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_KILL_SESSION:I,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_LOCAL_REQUEST_CREATE_CHILD:I,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_LOCAL_REQUEST_DELETE_CHILD:I,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_LOCAL_REQUEST_REKEY_CHILD:I,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_LOCAL_REQUEST_REKEY_CHILD_MOBIKE:I,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_PRIVATE_BASE:I,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_SHARED_BASE:I,blocked
-Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_TEST_BASE:I,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_TIMEOUT_BASE:I,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->REKEY_DELETE_TIMEOUT_MS:J,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->RETRY_INTERVAL_MS:J,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->SHARED_CMD_TO_STR:Landroid/util/SparseArray;,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->TIMEOUT_REKEY_REMOTE_DELETE:I,blocked
+Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->access$000(Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;)Z,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->executeUserCallback(Ljava/lang/Runnable;)V,blocked
+Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->killSession()V,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->log(Ljava/lang/String;)V,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->logWtf(Ljava/lang/String;)V,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->logWtf(Ljava/lang/String;Ljava/lang/Throwable;)V,blocked
@@ -2116,6 +2120,7 @@ Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->logi(Ljava/lan
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->logi(Ljava/lang/String;Ljava/lang/Throwable;)V,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->logv(Ljava/lang/String;)V,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->logw(Ljava/lang/String;)V,blocked
+Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->mIsClosing:Z,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->mLogTag:Ljava/lang/String;,blocked
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->mUserCbExecutor:Ljava/util/concurrent/Executor;,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$$ExternalSyntheticLambda0;-><init>(Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;Landroid/net/ipsec/ike/exceptions/IkeException;)V,blocked
@@ -2294,7 +2299,6 @@ Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteCre
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteCreate;-><init>(Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;)V,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteCreate;->handleCreateChildRequest(Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$ReceivedRequest;)V,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteCreate;->handleCreationFailureAndBackToIdle(Landroid/net/ipsec/ike/exceptions/IkeProtocolException;)V,blocked
-Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteCreate;->isKePayloadAcceptable(Lcom/android/internal/net/ipsec/ike/message/IkeKePayload;)Z,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteCreate;->lambda$handleCreateChildRequest$0$ChildSessionStateMachine$RekeyChildRemoteCreate(Landroid/net/IpSecTransform;)V,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteCreate;->processStateMessage(Landroid/os/Message;)Z,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteCreate;->this$0:Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;,blocked
@@ -2311,12 +2315,11 @@ Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteDel
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteDelete;->processStateMessage(Landroid/os/Message;)Z,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteDelete;->this$0:Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;-><clinit>()V,blocked
-Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;-><init>(Landroid/os/Looper;Landroid/content/Context;ILandroid/app/AlarmManager;Lcom/android/internal/net/ipsec/ike/utils/RandomnessFactory;Landroid/net/IpSecManager;Lcom/android/internal/net/ipsec/ike/utils/IpSecSpiGenerator;Landroid/net/ipsec/ike/ChildSessionParams;Ljava/util/concurrent/Executor;Landroid/net/ipsec/ike/ChildSessionCallback;Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$IChildSessionSmCallback;)V,blocked
+Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;-><init>(Landroid/os/Looper;Landroid/content/Context;ILandroid/os/Handler;Lcom/android/internal/net/ipsec/ike/utils/RandomnessFactory;Landroid/net/IpSecManager;Lcom/android/internal/net/ipsec/ike/utils/IpSecSpiGenerator;Landroid/net/ipsec/ike/ChildSessionParams;Ljava/util/concurrent/Executor;Landroid/net/ipsec/ike/ChildSessionCallback;Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$IChildSessionSmCallback;)V,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->CMD_GENERAL_BASE:I,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->CMD_HANDLE_FIRST_CHILD_EXCHANGE:I,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->CMD_HANDLE_RECEIVED_REQUEST:I,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->CMD_HANDLE_RECEIVED_RESPONSE:I,blocked
-Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->CMD_KILL_SESSION:I,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->CMD_TO_STR:Landroid/util/SparseArray;,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->CREATE_STATUS_CHILD_ERROR_INVALID_MSG:I,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->CREATE_STATUS_CHILD_ERROR_RCV_NOTIFY:I,blocked
@@ -2349,7 +2352,6 @@ Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->handleFirstChildE
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->isAwaitingCreateResp()Z,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->killSession()V,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->lambda$handleChildFatalError$0$ChildSessionStateMachine(Landroid/net/ipsec/ike/exceptions/IkeException;)V,blocked
-Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mAlarmManager:Landroid/app/AlarmManager;,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mChildCipher:Lcom/android/internal/net/ipsec/ike/crypto/IkeCipher;,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mChildIntegrity:Lcom/android/internal/net/ipsec/ike/crypto/IkeMacIntegrity;,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mChildSaRecordSurviving:Lcom/android/internal/net/ipsec/ike/SaRecord$ChildSaRecord;,blocked
@@ -2364,6 +2366,7 @@ Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mDeleteChildRemot
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mIdle:Lcom/android/internal/net/ipsec/ike/utils/State;,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mIdleWithDeferredRequest:Lcom/android/internal/net/ipsec/ike/utils/State;,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mIkeDhGroup:I,blocked
+Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mIkeHandler:Landroid/os/Handler;,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mIkePrf:Lcom/android/internal/net/ipsec/ike/crypto/IkeMacPrf;,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mIkeSessionId:I,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mInitial:Lcom/android/internal/net/ipsec/ike/utils/State;,blocked
@@ -2398,11 +2401,11 @@ Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->replyErrorNotific
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->replyErrorNotification(I[B)V,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->setSkD([B)V,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory$ChildSessionFactoryHelper;-><init>()V,blocked
-Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory$ChildSessionFactoryHelper;->makeChildSessionStateMachine(Landroid/os/Looper;Landroid/content/Context;ILandroid/app/AlarmManager;Lcom/android/internal/net/ipsec/ike/utils/RandomnessFactory;Lcom/android/internal/net/ipsec/ike/utils/IpSecSpiGenerator;Landroid/net/ipsec/ike/ChildSessionParams;Ljava/util/concurrent/Executor;Landroid/net/ipsec/ike/ChildSessionCallback;Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$IChildSessionSmCallback;)Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;,blocked
-Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory$IChildSessionFactoryHelper;->makeChildSessionStateMachine(Landroid/os/Looper;Landroid/content/Context;ILandroid/app/AlarmManager;Lcom/android/internal/net/ipsec/ike/utils/RandomnessFactory;Lcom/android/internal/net/ipsec/ike/utils/IpSecSpiGenerator;Landroid/net/ipsec/ike/ChildSessionParams;Ljava/util/concurrent/Executor;Landroid/net/ipsec/ike/ChildSessionCallback;Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$IChildSessionSmCallback;)Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;,blocked
+Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory$ChildSessionFactoryHelper;->makeChildSessionStateMachine(Landroid/os/Looper;Landroid/content/Context;ILandroid/os/Handler;Lcom/android/internal/net/ipsec/ike/utils/RandomnessFactory;Lcom/android/internal/net/ipsec/ike/utils/IpSecSpiGenerator;Landroid/net/ipsec/ike/ChildSessionParams;Ljava/util/concurrent/Executor;Landroid/net/ipsec/ike/ChildSessionCallback;Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$IChildSessionSmCallback;)Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;,blocked
+Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory$IChildSessionFactoryHelper;->makeChildSessionStateMachine(Landroid/os/Looper;Landroid/content/Context;ILandroid/os/Handler;Lcom/android/internal/net/ipsec/ike/utils/RandomnessFactory;Lcom/android/internal/net/ipsec/ike/utils/IpSecSpiGenerator;Landroid/net/ipsec/ike/ChildSessionParams;Ljava/util/concurrent/Executor;Landroid/net/ipsec/ike/ChildSessionCallback;Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$IChildSessionSmCallback;)Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory;-><clinit>()V,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory;-><init>()V,blocked
-Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory;->makeChildSessionStateMachine(Landroid/os/Looper;Landroid/content/Context;ILandroid/app/AlarmManager;Lcom/android/internal/net/ipsec/ike/utils/RandomnessFactory;Lcom/android/internal/net/ipsec/ike/utils/IpSecSpiGenerator;Landroid/net/ipsec/ike/ChildSessionParams;Ljava/util/concurrent/Executor;Landroid/net/ipsec/ike/ChildSessionCallback;Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$IChildSessionSmCallback;)Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;,blocked
+Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory;->makeChildSessionStateMachine(Landroid/os/Looper;Landroid/content/Context;ILandroid/os/Handler;Lcom/android/internal/net/ipsec/ike/utils/RandomnessFactory;Lcom/android/internal/net/ipsec/ike/utils/IpSecSpiGenerator;Landroid/net/ipsec/ike/ChildSessionParams;Ljava/util/concurrent/Executor;Landroid/net/ipsec/ike/ChildSessionCallback;Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$IChildSessionSmCallback;)Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory;->sChildSessionHelper:Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory$IChildSessionFactoryHelper;,blocked
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory;->setChildSessionFactoryHelper(Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory$IChildSessionFactoryHelper;)V,blocked
 Lcom/android/internal/net/ipsec/ike/IkeDhParams;-><init>()V,blocked
@@ -2589,7 +2592,8 @@ Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeAuth
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit$UnencryptedRetransmitter;-><init>(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit;Lcom/android/internal/net/ipsec/ike/message/IkeMessage;)V,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit$UnencryptedRetransmitter;-><init>(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit;Lcom/android/internal/net/ipsec/ike/message/IkeMessage;Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$1;)V,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit$UnencryptedRetransmitter;->handleRetransmissionFailure()V,blocked
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit$UnencryptedRetransmitter;->send(Lcom/android/internal/net/ipsec/ike/message/IkeMessage;)V,blocked
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit$UnencryptedRetransmitter;->mIkePacket:[B,blocked
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit$UnencryptedRetransmitter;->send()V,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit$UnencryptedRetransmitter;->this$1:Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit;,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit;-><init>(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)V,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit;->buildIkeInitReq()Lcom/android/internal/net/ipsec/ike/message/IkeMessage;,blocked
@@ -2654,8 +2658,8 @@ Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$EncryptedRetransmitte
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$EncryptedRetransmitter;-><init>(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;Lcom/android/internal/net/ipsec/ike/SaRecord$IkeSaRecord;Lcom/android/internal/net/ipsec/ike/message/IkeMessage;Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$1;)V,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$EncryptedRetransmitter;-><init>(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;Lcom/android/internal/net/ipsec/ike/message/IkeMessage;)V,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$EncryptedRetransmitter;->handleRetransmissionFailure()V,blocked
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$EncryptedRetransmitter;->mIkeSaRecord:Lcom/android/internal/net/ipsec/ike/SaRecord$IkeSaRecord;,blocked
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$EncryptedRetransmitter;->send(Lcom/android/internal/net/ipsec/ike/message/IkeMessage;)V,blocked
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$EncryptedRetransmitter;->mIkePacketList:[[B,blocked
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$EncryptedRetransmitter;->send()V,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$EncryptedRetransmitter;->this$0:Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$ExceptionHandler$$ExternalSyntheticLambda0;-><init>(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$ExceptionHandler;Ljava/lang/RuntimeException;)V,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$ExceptionHandler$$ExternalSyntheticLambda0;->f$0:Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$ExceptionHandler;,blocked
@@ -2676,7 +2680,7 @@ Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$Idle;->enterState()V,
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$Idle;->executeLocalRequest(Lcom/android/internal/net/ipsec/ike/IkeLocalRequestScheduler$LocalRequest;Landroid/os/Message;)V,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$Idle;->exitState()V,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$Idle;->isRequestForCurrentSa(Lcom/android/internal/net/ipsec/ike/IkeLocalRequestScheduler$LocalRequest;)Z,blocked
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$Idle;->mDpdIntent:Landroid/app/PendingIntent;,blocked
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$Idle;->mDpdAlarm:Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$Idle;->processStateMessage(Landroid/os/Message;)Z,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$Idle;->this$0:Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$Initial;-><init>(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)V,blocked
@@ -2821,7 +2825,6 @@ Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->CMD_FORCE_TRANSITIO
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->CMD_GENERAL_BASE:I,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->CMD_HANDLE_FIRST_CHILD_NEGOTIATION:I,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->CMD_IKE_LOCAL_REQUEST_BASE:I,blocked
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->CMD_KILL_SESSION:I,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->CMD_LOCAL_REQUEST_CREATE_IKE:I,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->CMD_LOCAL_REQUEST_DELETE_IKE:I,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->CMD_LOCAL_REQUEST_DPD:I,blocked
@@ -2856,16 +2859,16 @@ Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$100(Lcom/and
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1000(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;Ljava/lang/Exception;)V,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1200(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Lcom/android/internal/net/ipsec/ike/IkeLocalRequestScheduler;,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1300(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Landroid/os/PowerManager$WakeLock;,blocked
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1400(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Landroid/content/Context;,blocked
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1500(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;J)Ljava/lang/String;,blocked
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1600(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;IJ)Landroid/os/Message;,blocked
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1700(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Landroid/app/AlarmManager;,blocked
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1800(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Lcom/android/internal/net/ipsec/ike/IkeLocalRequestScheduler$LocalRequestFactory;,blocked
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1900(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Landroid/util/LongSparseArray;,blocked
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1400(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;IJ)Landroid/os/Message;,blocked
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1500(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Landroid/content/Context;,blocked
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1600(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;J)Ljava/lang/String;,blocked
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1700(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Lcom/android/internal/net/ipsec/ike/IkeLocalRequestScheduler$LocalRequestFactory;,blocked
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1800(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Landroid/util/LongSparseArray;,blocked
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1900(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$TempFailureHandler;,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$200(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Landroid/util/SparseArray;,blocked
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$2000(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$TempFailureHandler;,blocked
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$2100(Lcom/android/internal/net/ipsec/ike/message/IkeMessage;)I,blocked
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$2200(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Lcom/android/internal/net/ipsec/ike/ike3gpp/Ike3gppExtensionExchange;,blocked
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$2000(Lcom/android/internal/net/ipsec/ike/message/IkeMessage;)I,blocked
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$2100(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Lcom/android/internal/net/ipsec/ike/ike3gpp/Ike3gppExtensionExchange;,blocked
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$2200(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;[[B)V,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$2600(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Lcom/android/internal/net/ipsec/ike/utils/IkeSpiGenerator;,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$2900(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;Ljava/util/List;Lcom/android/internal/net/ipsec/ike/message/IkeNotifyPayload;)Z,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$300(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;Lcom/android/internal/net/ipsec/ike/IkeLocalRequestScheduler$LocalRequest;)V,blocked
@@ -3008,6 +3011,7 @@ Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->sIntentFilter:Landr
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->scheduleRetry(Lcom/android/internal/net/ipsec/ike/IkeLocalRequestScheduler$LocalRequest;)V,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->sendEncryptedIkeMessage(Lcom/android/internal/net/ipsec/ike/SaRecord$IkeSaRecord;Lcom/android/internal/net/ipsec/ike/message/IkeMessage;)V,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->sendEncryptedIkeMessage(Lcom/android/internal/net/ipsec/ike/message/IkeMessage;)V,blocked
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->sendEncryptedIkePackets([[B)V,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->setNetwork(Landroid/net/Network;)V,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->setRemoteAddress()V,blocked
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->switchToIkeSocket(Lcom/android/internal/net/ipsec/ike/IkeSocket;)V,blocked
@@ -3210,13 +3214,12 @@ Lcom/android/internal/net/ipsec/ike/SaRecord$IkeSaRecordConfig;->saLifetimeAlarm
 Lcom/android/internal/net/ipsec/ike/SaRecord$IpSecTransformHelper;-><init>()V,blocked
 Lcom/android/internal/net/ipsec/ike/SaRecord$IpSecTransformHelper;->TAG:Ljava/lang/String;,blocked
 Lcom/android/internal/net/ipsec/ike/SaRecord$IpSecTransformHelper;->makeIpSecTransform(Landroid/content/Context;Ljava/net/InetAddress;Landroid/net/IpSecManager$UdpEncapsulationSocket;Landroid/net/IpSecManager$SecurityParameterIndex;Lcom/android/internal/net/ipsec/ike/crypto/IkeMacIntegrity;Lcom/android/internal/net/ipsec/ike/crypto/IkeCipher;[B[BZ)Landroid/net/IpSecTransform;,blocked
-Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;-><init>(JJLandroid/app/PendingIntent;Landroid/app/PendingIntent;Landroid/app/AlarmManager;)V,blocked
+Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;-><init>(Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;)V,blocked
 Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;->cancelLifetimeExpiryAlarm(Ljava/lang/String;)V,blocked
-Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;->mAlarmManager:Landroid/app/AlarmManager;,blocked
+Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;->mDeleteAlarm:Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;,blocked
 Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;->mDeleteDelayMs:J,blocked
-Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;->mDeleteSaIntent:Landroid/app/PendingIntent;,blocked
+Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;->mRekeyAlarm:Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;,blocked
 Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;->mRekeyDelayMs:J,blocked
-Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;->mRekeySaIntent:Landroid/app/PendingIntent;,blocked
 Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;->rescheduleRekey(J)V,blocked
 Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;->scheduleLifetimeExpiryAlarm(Ljava/lang/String;)V,blocked
 Lcom/android/internal/net/ipsec/ike/SaRecord$SaRecordHelper;-><init>()V,blocked
@@ -3402,23 +3405,23 @@ Lcom/android/internal/net/ipsec/ike/ike3gpp/Ike3gppN1ModeUtils;->getSnssaiFromNo
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl$HardwareKeepaliveCallback;->onHardwareOffloadError()V,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl$HardwareKeepaliveCallback;->onNetworkError()V,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl$MySocketKeepaliveCb;-><init>(Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;)V,blocked
-Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl$MySocketKeepaliveCb;-><init>(Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl$1;)V,blocked
 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;->this$0:Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;-><init>(Landroid/content/Context;Landroid/net/ConnectivityManager;ILjava/net/Inet4Address;Ljava/net/Inet4Address;Landroid/net/IpSecManager$UdpEncapsulationSocket;Landroid/net/Network;Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl$HardwareKeepaliveCallback;)V,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;->TAG:Ljava/lang/String;,blocked
-Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;->access$100(Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;)Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl$HardwareKeepaliveCallback;,blocked
+Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;->access$000(Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;)Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl$HardwareKeepaliveCallback;,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;->mHardwareKeepaliveCb:Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl$HardwareKeepaliveCallback;,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;->mKeepaliveDelaySeconds:I,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;->mSocketKeepalive:Landroid/net/SocketKeepalive;,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;->onAlarmFired()V,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;->start()V,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;->stop()V,blocked
-Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$HardwareKeepaliveCb;-><init>(Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;Landroid/content/Context;ILjava/net/Inet4Address;Landroid/net/IpSecManager$UdpEncapsulationSocket;Landroid/app/PendingIntent;)V,blocked
+Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$Dependencies;-><init>()V,blocked
+Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$Dependencies;->createSoftwareKeepaliveImpl(Landroid/content/Context;Ljava/net/Inet4Address;Landroid/net/IpSecManager$UdpEncapsulationSocket;Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;)Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;,blocked
+Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$HardwareKeepaliveCb;-><init>(Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;Landroid/content/Context;Ljava/net/Inet4Address;Landroid/net/IpSecManager$UdpEncapsulationSocket;Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;)V,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$HardwareKeepaliveCb;->mContext:Landroid/content/Context;,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$HardwareKeepaliveCb;->mDest:Ljava/net/Inet4Address;,blocked
-Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$HardwareKeepaliveCb;->mKeepAliveAlarmIntent:Landroid/app/PendingIntent;,blocked
-Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$HardwareKeepaliveCb;->mKeepaliveDelaySeconds:I,blocked
+Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$HardwareKeepaliveCb;->mIkeAlarmConfig:Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$HardwareKeepaliveCb;->mSocket:Landroid/net/IpSecManager$UdpEncapsulationSocket;,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$HardwareKeepaliveCb;->onHardwareOffloadError()V,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$HardwareKeepaliveCb;->onNetworkError()V,blocked
@@ -3426,22 +3429,23 @@ Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$HardwareKeepalive
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$NattKeepalive;->onAlarmFired()V,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$NattKeepalive;->start()V,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$NattKeepalive;->stop()V,blocked
-Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;-><init>(Landroid/content/Context;Landroid/net/ConnectivityManager;ILjava/net/Inet4Address;Ljava/net/Inet4Address;Landroid/net/IpSecManager$UdpEncapsulationSocket;Landroid/net/Network;Landroid/app/PendingIntent;)V,blocked
+Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;-><init>(Landroid/content/Context;Landroid/net/ConnectivityManager;ILjava/net/Inet4Address;Ljava/net/Inet4Address;Landroid/net/IpSecManager$UdpEncapsulationSocket;Landroid/net/Network;Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;)V,blocked
+Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;-><init>(Landroid/content/Context;Landroid/net/ConnectivityManager;ILjava/net/Inet4Address;Ljava/net/Inet4Address;Landroid/net/IpSecManager$UdpEncapsulationSocket;Landroid/net/Network;Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$Dependencies;)V,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;->TAG:Ljava/lang/String;,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;->access$000(Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;)Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$NattKeepalive;,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;->access$002(Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$NattKeepalive;)Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$NattKeepalive;,blocked
+Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;->access$100(Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;)Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$Dependencies;,blocked
+Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;->mDeps:Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$Dependencies;,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;->mNattKeepalive:Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$NattKeepalive;,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;->onAlarmFired()V,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;->start()V,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;->stop()V,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;-><clinit>()V,blocked
-Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;-><init>(Landroid/content/Context;ILjava/net/Inet4Address;Landroid/net/IpSecManager$UdpEncapsulationSocket;Landroid/app/PendingIntent;)V,blocked
+Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;-><init>(Landroid/content/Context;Ljava/net/Inet4Address;Landroid/net/IpSecManager$UdpEncapsulationSocket;Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;)V,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;->NATT_KEEPALIVE_PAYLOAD:[B,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;->TAG:Ljava/lang/String;,blocked
-Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;->mAlarmMgr:Landroid/app/AlarmManager;,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;->mDestAddress:Ljava/net/Inet4Address;,blocked
-Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;->mKeepaliveDelayMs:J,blocked
-Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;->mKeepaliveIntent:Landroid/app/PendingIntent;,blocked
+Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;->mIkeAlarm:Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;->mSocket:Landroid/net/IpSecManager$UdpEncapsulationSocket;,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;->onAlarmFired()V,blocked
 Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;->sendKeepaliveAndScheduleNext()V,blocked
@@ -4153,6 +4157,7 @@ Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->createInitialIkeSaPay
 Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->createRekeyIkeSaRequestPayload([Landroid/net/ipsec/ike/IkeSaProposal;Lcom/android/internal/net/ipsec/ike/utils/IkeSpiGenerator;Ljava/net/InetAddress;)Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;,blocked
 Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->createRekeyIkeSaResponsePayload(BLandroid/net/ipsec/ike/IkeSaProposal;Lcom/android/internal/net/ipsec/ike/utils/IkeSpiGenerator;Ljava/net/InetAddress;)Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;,blocked
 Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->encodeToByteBuffer(ILjava/nio/ByteBuffer;)V,blocked
+Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->getNegotiatedChildProposalWithDh(Landroid/net/ipsec/ike/ChildSaProposal;Ljava/util/List;II)Landroid/net/ipsec/ike/ChildSaProposal;,blocked
 Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->getNegotiatedProposalNumber(Landroid/net/ipsec/ike/SaProposal;)B,blocked
 Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->getPayloadLength()I,blocked
 Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->getTypeString()Ljava/lang/String;,blocked
@@ -4298,6 +4303,36 @@ Lcom/android/internal/net/ipsec/ike/utils/IState;->enter()V,blocked
 Lcom/android/internal/net/ipsec/ike/utils/IState;->exit()V,blocked
 Lcom/android/internal/net/ipsec/ike/utils/IState;->getName()Ljava/lang/String;,blocked
 Lcom/android/internal/net/ipsec/ike/utils/IState;->processMessage(Landroid/os/Message;)Z,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$Dependencies;-><init>()V,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$Dependencies;->getMyUid()I,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$Dependencies;->newWakeMessage(Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;)Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;-><init>(Landroid/content/Context;Ljava/lang/String;JLandroid/app/PendingIntent;Landroid/os/Message;)V,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;->context:Landroid/content/Context;,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;->delayMs:J,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;->message:Landroid/os/Message;,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;->pendingIntent:Landroid/app/PendingIntent;,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;->tag:Ljava/lang/String;,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmWithListener;-><init>(Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$Dependencies;)V,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmWithListener;->cancel()V,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmWithListener;->mWakeupMsg:Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmWithListener;->schedule()V,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmWithPendingIntent;-><init>(Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;)V,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmWithPendingIntent;->cancel()V,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmWithPendingIntent;->mPendingIntent:Landroid/app/PendingIntent;,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmWithPendingIntent;->schedule()V,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;-><clinit>()V,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;-><init>(Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;)V,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;-><init>(Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$1;)V,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;->cancel()V,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;->mAlarmManager:Landroid/app/AlarmManager;,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;->mDelayMs:J,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;->mTag:Ljava/lang/String;,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;->newExactAlarm(Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;)Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;->newExactAlarm(Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$Dependencies;)Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;->newExactAndAllowWhileIdleAlarm(Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;)Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;->newExactAndAllowWhileIdleAlarm(Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$Dependencies;)Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;->sDeps:Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$Dependencies;,blocked
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;->schedule()V,blocked
 Lcom/android/internal/net/ipsec/ike/utils/IkeAlarmReceiver;-><clinit>()V,blocked
 Lcom/android/internal/net/ipsec/ike/utils/IkeAlarmReceiver;-><init>()V,blocked
 Lcom/android/internal/net/ipsec/ike/utils/IkeAlarmReceiver;->ACTION_DELETE_CHILD:Ljava/lang/String;,blocked
@@ -4356,7 +4391,7 @@ Lcom/android/internal/net/ipsec/ike/utils/Retransmitter;->mRetransmissionTimeout
 Lcom/android/internal/net/ipsec/ike/utils/Retransmitter;->mRetransmitCount:I,blocked
 Lcom/android/internal/net/ipsec/ike/utils/Retransmitter;->mRetransmitMsg:Lcom/android/internal/net/ipsec/ike/message/IkeMessage;,blocked
 Lcom/android/internal/net/ipsec/ike/utils/Retransmitter;->retransmit()V,blocked
-Lcom/android/internal/net/ipsec/ike/utils/Retransmitter;->send(Lcom/android/internal/net/ipsec/ike/message/IkeMessage;)V,blocked
+Lcom/android/internal/net/ipsec/ike/utils/Retransmitter;->send()V,blocked
 Lcom/android/internal/net/ipsec/ike/utils/Retransmitter;->stopRetransmitting()V,blocked
 Lcom/android/internal/net/ipsec/ike/utils/State;-><init>()V,blocked
 Lcom/android/internal/net/ipsec/ike/utils/State;->enter()V,blocked
@@ -4568,6 +4603,24 @@ Lcom/android/internal/net/ipsec/ike/utils/StateMachine;->toString()Ljava/lang/St
 Lcom/android/internal/net/ipsec/ike/utils/StateMachine;->transitionTo(Lcom/android/internal/net/ipsec/ike/utils/IState;)V,blocked
 Lcom/android/internal/net/ipsec/ike/utils/StateMachine;->transitionToHaltingState()V,blocked
 Lcom/android/internal/net/ipsec/ike/utils/StateMachine;->unhandledMessage(Landroid/os/Message;)V,blocked
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;-><init>(Landroid/content/Context;Landroid/os/Handler;Ljava/lang/String;I)V,blocked
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;-><init>(Landroid/content/Context;Landroid/os/Handler;Ljava/lang/String;II)V,blocked
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;-><init>(Landroid/content/Context;Landroid/os/Handler;Ljava/lang/String;III)V,blocked
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;-><init>(Landroid/content/Context;Landroid/os/Handler;Ljava/lang/String;IIILjava/lang/Object;)V,blocked
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;-><init>(Landroid/content/Context;Landroid/os/Handler;Ljava/lang/String;Ljava/lang/Runnable;)V,blocked
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->cancel()V,blocked
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->getAlarmManager(Landroid/content/Context;)Landroid/app/AlarmManager;,blocked
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->mAlarmManager:Landroid/app/AlarmManager;,blocked
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->mArg1:I,blocked
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->mArg2:I,blocked
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->mCmd:I,blocked
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->mCmdName:Ljava/lang/String;,blocked
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->mHandler:Landroid/os/Handler;,blocked
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->mObj:Ljava/lang/Object;,blocked
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->mRunnable:Ljava/lang/Runnable;,blocked
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->mScheduled:Z,blocked
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->onAlarm()V,public-api,sdk,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->schedule(J)V,blocked
 Lcom/android/internal/net/org/bouncycastle/crypto/Digest;->doFinal([BI)I,blocked
 Lcom/android/internal/net/org/bouncycastle/crypto/Digest;->getAlgorithmName()Ljava/lang/String;,blocked
 Lcom/android/internal/net/org/bouncycastle/crypto/Digest;->getDigestSize()I,blocked
diff --git a/current/hiddenapi/stub-flags.csv b/current/hiddenapi/stub-flags.csv
index 2684eac..20e4cf9 100644
--- a/current/hiddenapi/stub-flags.csv
+++ b/current/hiddenapi/stub-flags.csv
@@ -2083,6 +2083,7 @@ Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine$ExceptionHandler
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine$ExceptionHandlerBase;->enterState()V
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine$ExceptionHandlerBase;->exit()V
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine$ExceptionHandlerBase;->exitState()V
+Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine$ExceptionHandlerBase;->getCmdStr(I)Ljava/lang/String;
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine$ExceptionHandlerBase;->getCmdString(I)Ljava/lang/String;
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine$ExceptionHandlerBase;->processMessage(Landroid/os/Message;)Z
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine$ExceptionHandlerBase;->processStateMessage(Landroid/os/Message;)Z
@@ -2092,19 +2093,22 @@ Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;-><init>(Ljava/l
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_CATEGORY_SIZE:I
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_CHILD_LOCAL_REQUEST_BASE:I
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_FORCE_TRANSITION:I
+Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_GENERIC_BASE:I
+Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_KILL_SESSION:I
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_LOCAL_REQUEST_CREATE_CHILD:I
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_LOCAL_REQUEST_DELETE_CHILD:I
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_LOCAL_REQUEST_REKEY_CHILD:I
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_LOCAL_REQUEST_REKEY_CHILD_MOBIKE:I
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_PRIVATE_BASE:I
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_SHARED_BASE:I
-Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_TEST_BASE:I
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->CMD_TIMEOUT_BASE:I
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->REKEY_DELETE_TIMEOUT_MS:J
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->RETRY_INTERVAL_MS:J
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->SHARED_CMD_TO_STR:Landroid/util/SparseArray;
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->TIMEOUT_REKEY_REMOTE_DELETE:I
+Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->access$000(Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;)Z
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->executeUserCallback(Ljava/lang/Runnable;)V
+Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->killSession()V
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->log(Ljava/lang/String;)V
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->logWtf(Ljava/lang/String;)V
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->logWtf(Ljava/lang/String;Ljava/lang/Throwable;)V
@@ -2116,6 +2120,7 @@ Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->logi(Ljava/lan
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->logi(Ljava/lang/String;Ljava/lang/Throwable;)V
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->logv(Ljava/lang/String;)V
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->logw(Ljava/lang/String;)V
+Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->mIsClosing:Z
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->mLogTag:Ljava/lang/String;
 Lcom/android/internal/net/ipsec/ike/AbstractSessionStateMachine;->mUserCbExecutor:Ljava/util/concurrent/Executor;
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$$ExternalSyntheticLambda0;-><init>(Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;Landroid/net/ipsec/ike/exceptions/IkeException;)V
@@ -2294,7 +2299,6 @@ Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteCre
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteCreate;-><init>(Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;)V
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteCreate;->handleCreateChildRequest(Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$ReceivedRequest;)V
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteCreate;->handleCreationFailureAndBackToIdle(Landroid/net/ipsec/ike/exceptions/IkeProtocolException;)V
-Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteCreate;->isKePayloadAcceptable(Lcom/android/internal/net/ipsec/ike/message/IkeKePayload;)Z
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteCreate;->lambda$handleCreateChildRequest$0$ChildSessionStateMachine$RekeyChildRemoteCreate(Landroid/net/IpSecTransform;)V
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteCreate;->processStateMessage(Landroid/os/Message;)Z
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteCreate;->this$0:Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;
@@ -2311,12 +2315,11 @@ Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteDel
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteDelete;->processStateMessage(Landroid/os/Message;)Z
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteDelete;->this$0:Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;-><clinit>()V
-Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;-><init>(Landroid/os/Looper;Landroid/content/Context;ILandroid/app/AlarmManager;Lcom/android/internal/net/ipsec/ike/utils/RandomnessFactory;Landroid/net/IpSecManager;Lcom/android/internal/net/ipsec/ike/utils/IpSecSpiGenerator;Landroid/net/ipsec/ike/ChildSessionParams;Ljava/util/concurrent/Executor;Landroid/net/ipsec/ike/ChildSessionCallback;Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$IChildSessionSmCallback;)V
+Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;-><init>(Landroid/os/Looper;Landroid/content/Context;ILandroid/os/Handler;Lcom/android/internal/net/ipsec/ike/utils/RandomnessFactory;Landroid/net/IpSecManager;Lcom/android/internal/net/ipsec/ike/utils/IpSecSpiGenerator;Landroid/net/ipsec/ike/ChildSessionParams;Ljava/util/concurrent/Executor;Landroid/net/ipsec/ike/ChildSessionCallback;Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$IChildSessionSmCallback;)V
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->CMD_GENERAL_BASE:I
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->CMD_HANDLE_FIRST_CHILD_EXCHANGE:I
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->CMD_HANDLE_RECEIVED_REQUEST:I
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->CMD_HANDLE_RECEIVED_RESPONSE:I
-Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->CMD_KILL_SESSION:I
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->CMD_TO_STR:Landroid/util/SparseArray;
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->CREATE_STATUS_CHILD_ERROR_INVALID_MSG:I
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->CREATE_STATUS_CHILD_ERROR_RCV_NOTIFY:I
@@ -2349,7 +2352,6 @@ Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->handleFirstChildE
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->isAwaitingCreateResp()Z
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->killSession()V
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->lambda$handleChildFatalError$0$ChildSessionStateMachine(Landroid/net/ipsec/ike/exceptions/IkeException;)V
-Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mAlarmManager:Landroid/app/AlarmManager;
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mChildCipher:Lcom/android/internal/net/ipsec/ike/crypto/IkeCipher;
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mChildIntegrity:Lcom/android/internal/net/ipsec/ike/crypto/IkeMacIntegrity;
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mChildSaRecordSurviving:Lcom/android/internal/net/ipsec/ike/SaRecord$ChildSaRecord;
@@ -2364,6 +2366,7 @@ Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mDeleteChildRemot
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mIdle:Lcom/android/internal/net/ipsec/ike/utils/State;
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mIdleWithDeferredRequest:Lcom/android/internal/net/ipsec/ike/utils/State;
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mIkeDhGroup:I
+Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mIkeHandler:Landroid/os/Handler;
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mIkePrf:Lcom/android/internal/net/ipsec/ike/crypto/IkeMacPrf;
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mIkeSessionId:I
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->mInitial:Lcom/android/internal/net/ipsec/ike/utils/State;
@@ -2398,11 +2401,11 @@ Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->replyErrorNotific
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->replyErrorNotification(I[B)V
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;->setSkD([B)V
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory$ChildSessionFactoryHelper;-><init>()V
-Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory$ChildSessionFactoryHelper;->makeChildSessionStateMachine(Landroid/os/Looper;Landroid/content/Context;ILandroid/app/AlarmManager;Lcom/android/internal/net/ipsec/ike/utils/RandomnessFactory;Lcom/android/internal/net/ipsec/ike/utils/IpSecSpiGenerator;Landroid/net/ipsec/ike/ChildSessionParams;Ljava/util/concurrent/Executor;Landroid/net/ipsec/ike/ChildSessionCallback;Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$IChildSessionSmCallback;)Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;
-Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory$IChildSessionFactoryHelper;->makeChildSessionStateMachine(Landroid/os/Looper;Landroid/content/Context;ILandroid/app/AlarmManager;Lcom/android/internal/net/ipsec/ike/utils/RandomnessFactory;Lcom/android/internal/net/ipsec/ike/utils/IpSecSpiGenerator;Landroid/net/ipsec/ike/ChildSessionParams;Ljava/util/concurrent/Executor;Landroid/net/ipsec/ike/ChildSessionCallback;Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$IChildSessionSmCallback;)Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;
+Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory$ChildSessionFactoryHelper;->makeChildSessionStateMachine(Landroid/os/Looper;Landroid/content/Context;ILandroid/os/Handler;Lcom/android/internal/net/ipsec/ike/utils/RandomnessFactory;Lcom/android/internal/net/ipsec/ike/utils/IpSecSpiGenerator;Landroid/net/ipsec/ike/ChildSessionParams;Ljava/util/concurrent/Executor;Landroid/net/ipsec/ike/ChildSessionCallback;Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$IChildSessionSmCallback;)Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;
+Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory$IChildSessionFactoryHelper;->makeChildSessionStateMachine(Landroid/os/Looper;Landroid/content/Context;ILandroid/os/Handler;Lcom/android/internal/net/ipsec/ike/utils/RandomnessFactory;Lcom/android/internal/net/ipsec/ike/utils/IpSecSpiGenerator;Landroid/net/ipsec/ike/ChildSessionParams;Ljava/util/concurrent/Executor;Landroid/net/ipsec/ike/ChildSessionCallback;Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$IChildSessionSmCallback;)Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory;-><clinit>()V
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory;-><init>()V
-Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory;->makeChildSessionStateMachine(Landroid/os/Looper;Landroid/content/Context;ILandroid/app/AlarmManager;Lcom/android/internal/net/ipsec/ike/utils/RandomnessFactory;Lcom/android/internal/net/ipsec/ike/utils/IpSecSpiGenerator;Landroid/net/ipsec/ike/ChildSessionParams;Ljava/util/concurrent/Executor;Landroid/net/ipsec/ike/ChildSessionCallback;Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$IChildSessionSmCallback;)Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;
+Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory;->makeChildSessionStateMachine(Landroid/os/Looper;Landroid/content/Context;ILandroid/os/Handler;Lcom/android/internal/net/ipsec/ike/utils/RandomnessFactory;Lcom/android/internal/net/ipsec/ike/utils/IpSecSpiGenerator;Landroid/net/ipsec/ike/ChildSessionParams;Ljava/util/concurrent/Executor;Landroid/net/ipsec/ike/ChildSessionCallback;Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$IChildSessionSmCallback;)Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine;
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory;->sChildSessionHelper:Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory$IChildSessionFactoryHelper;
 Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory;->setChildSessionFactoryHelper(Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachineFactory$IChildSessionFactoryHelper;)V
 Lcom/android/internal/net/ipsec/ike/IkeDhParams;-><init>()V
@@ -2589,7 +2592,8 @@ Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeAuth
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit$UnencryptedRetransmitter;-><init>(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit;Lcom/android/internal/net/ipsec/ike/message/IkeMessage;)V
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit$UnencryptedRetransmitter;-><init>(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit;Lcom/android/internal/net/ipsec/ike/message/IkeMessage;Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$1;)V
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit$UnencryptedRetransmitter;->handleRetransmissionFailure()V
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit$UnencryptedRetransmitter;->send(Lcom/android/internal/net/ipsec/ike/message/IkeMessage;)V
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit$UnencryptedRetransmitter;->mIkePacket:[B
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit$UnencryptedRetransmitter;->send()V
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit$UnencryptedRetransmitter;->this$1:Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit;
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit;-><init>(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)V
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeInit;->buildIkeInitReq()Lcom/android/internal/net/ipsec/ike/message/IkeMessage;
@@ -2654,8 +2658,8 @@ Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$EncryptedRetransmitte
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$EncryptedRetransmitter;-><init>(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;Lcom/android/internal/net/ipsec/ike/SaRecord$IkeSaRecord;Lcom/android/internal/net/ipsec/ike/message/IkeMessage;Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$1;)V
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$EncryptedRetransmitter;-><init>(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;Lcom/android/internal/net/ipsec/ike/message/IkeMessage;)V
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$EncryptedRetransmitter;->handleRetransmissionFailure()V
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$EncryptedRetransmitter;->mIkeSaRecord:Lcom/android/internal/net/ipsec/ike/SaRecord$IkeSaRecord;
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$EncryptedRetransmitter;->send(Lcom/android/internal/net/ipsec/ike/message/IkeMessage;)V
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$EncryptedRetransmitter;->mIkePacketList:[[B
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$EncryptedRetransmitter;->send()V
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$EncryptedRetransmitter;->this$0:Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$ExceptionHandler$$ExternalSyntheticLambda0;-><init>(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$ExceptionHandler;Ljava/lang/RuntimeException;)V
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$ExceptionHandler$$ExternalSyntheticLambda0;->f$0:Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$ExceptionHandler;
@@ -2676,7 +2680,7 @@ Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$Idle;->enterState()V
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$Idle;->executeLocalRequest(Lcom/android/internal/net/ipsec/ike/IkeLocalRequestScheduler$LocalRequest;Landroid/os/Message;)V
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$Idle;->exitState()V
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$Idle;->isRequestForCurrentSa(Lcom/android/internal/net/ipsec/ike/IkeLocalRequestScheduler$LocalRequest;)Z
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$Idle;->mDpdIntent:Landroid/app/PendingIntent;
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$Idle;->mDpdAlarm:Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$Idle;->processStateMessage(Landroid/os/Message;)Z
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$Idle;->this$0:Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$Initial;-><init>(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)V
@@ -2821,7 +2825,6 @@ Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->CMD_FORCE_TRANSITIO
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->CMD_GENERAL_BASE:I
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->CMD_HANDLE_FIRST_CHILD_NEGOTIATION:I
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->CMD_IKE_LOCAL_REQUEST_BASE:I
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->CMD_KILL_SESSION:I
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->CMD_LOCAL_REQUEST_CREATE_IKE:I
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->CMD_LOCAL_REQUEST_DELETE_IKE:I
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->CMD_LOCAL_REQUEST_DPD:I
@@ -2856,16 +2859,16 @@ Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$100(Lcom/and
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1000(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;Ljava/lang/Exception;)V
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1200(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Lcom/android/internal/net/ipsec/ike/IkeLocalRequestScheduler;
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1300(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Landroid/os/PowerManager$WakeLock;
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1400(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Landroid/content/Context;
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1500(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;J)Ljava/lang/String;
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1600(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;IJ)Landroid/os/Message;
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1700(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Landroid/app/AlarmManager;
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1800(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Lcom/android/internal/net/ipsec/ike/IkeLocalRequestScheduler$LocalRequestFactory;
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1900(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Landroid/util/LongSparseArray;
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1400(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;IJ)Landroid/os/Message;
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1500(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Landroid/content/Context;
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1600(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;J)Ljava/lang/String;
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1700(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Lcom/android/internal/net/ipsec/ike/IkeLocalRequestScheduler$LocalRequestFactory;
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1800(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Landroid/util/LongSparseArray;
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$1900(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$TempFailureHandler;
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$200(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Landroid/util/SparseArray;
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$2000(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$TempFailureHandler;
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$2100(Lcom/android/internal/net/ipsec/ike/message/IkeMessage;)I
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$2200(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Lcom/android/internal/net/ipsec/ike/ike3gpp/Ike3gppExtensionExchange;
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$2000(Lcom/android/internal/net/ipsec/ike/message/IkeMessage;)I
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$2100(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Lcom/android/internal/net/ipsec/ike/ike3gpp/Ike3gppExtensionExchange;
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$2200(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;[[B)V
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$2600(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;)Lcom/android/internal/net/ipsec/ike/utils/IkeSpiGenerator;
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$2900(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;Ljava/util/List;Lcom/android/internal/net/ipsec/ike/message/IkeNotifyPayload;)Z
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->access$300(Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;Lcom/android/internal/net/ipsec/ike/IkeLocalRequestScheduler$LocalRequest;)V
@@ -3008,6 +3011,7 @@ Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->sIntentFilter:Landr
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->scheduleRetry(Lcom/android/internal/net/ipsec/ike/IkeLocalRequestScheduler$LocalRequest;)V
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->sendEncryptedIkeMessage(Lcom/android/internal/net/ipsec/ike/SaRecord$IkeSaRecord;Lcom/android/internal/net/ipsec/ike/message/IkeMessage;)V
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->sendEncryptedIkeMessage(Lcom/android/internal/net/ipsec/ike/message/IkeMessage;)V
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->sendEncryptedIkePackets([[B)V
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->setNetwork(Landroid/net/Network;)V
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->setRemoteAddress()V
 Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine;->switchToIkeSocket(Lcom/android/internal/net/ipsec/ike/IkeSocket;)V
@@ -3210,13 +3214,12 @@ Lcom/android/internal/net/ipsec/ike/SaRecord$IkeSaRecordConfig;->saLifetimeAlarm
 Lcom/android/internal/net/ipsec/ike/SaRecord$IpSecTransformHelper;-><init>()V
 Lcom/android/internal/net/ipsec/ike/SaRecord$IpSecTransformHelper;->TAG:Ljava/lang/String;
 Lcom/android/internal/net/ipsec/ike/SaRecord$IpSecTransformHelper;->makeIpSecTransform(Landroid/content/Context;Ljava/net/InetAddress;Landroid/net/IpSecManager$UdpEncapsulationSocket;Landroid/net/IpSecManager$SecurityParameterIndex;Lcom/android/internal/net/ipsec/ike/crypto/IkeMacIntegrity;Lcom/android/internal/net/ipsec/ike/crypto/IkeCipher;[B[BZ)Landroid/net/IpSecTransform;
-Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;-><init>(JJLandroid/app/PendingIntent;Landroid/app/PendingIntent;Landroid/app/AlarmManager;)V
+Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;-><init>(Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;)V
 Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;->cancelLifetimeExpiryAlarm(Ljava/lang/String;)V
-Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;->mAlarmManager:Landroid/app/AlarmManager;
+Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;->mDeleteAlarm:Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;
 Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;->mDeleteDelayMs:J
-Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;->mDeleteSaIntent:Landroid/app/PendingIntent;
+Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;->mRekeyAlarm:Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;
 Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;->mRekeyDelayMs:J
-Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;->mRekeySaIntent:Landroid/app/PendingIntent;
 Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;->rescheduleRekey(J)V
 Lcom/android/internal/net/ipsec/ike/SaRecord$SaLifetimeAlarmScheduler;->scheduleLifetimeExpiryAlarm(Ljava/lang/String;)V
 Lcom/android/internal/net/ipsec/ike/SaRecord$SaRecordHelper;-><init>()V
@@ -3402,23 +3405,23 @@ Lcom/android/internal/net/ipsec/ike/ike3gpp/Ike3gppN1ModeUtils;->getSnssaiFromNo
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl$HardwareKeepaliveCallback;->onHardwareOffloadError()V
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl$HardwareKeepaliveCallback;->onNetworkError()V
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl$MySocketKeepaliveCb;-><init>(Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;)V
-Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl$MySocketKeepaliveCb;-><init>(Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl$1;)V
 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;->this$0:Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;-><init>(Landroid/content/Context;Landroid/net/ConnectivityManager;ILjava/net/Inet4Address;Ljava/net/Inet4Address;Landroid/net/IpSecManager$UdpEncapsulationSocket;Landroid/net/Network;Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl$HardwareKeepaliveCallback;)V
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;->TAG:Ljava/lang/String;
-Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;->access$100(Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;)Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl$HardwareKeepaliveCallback;
+Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;->access$000(Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;)Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl$HardwareKeepaliveCallback;
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;->mHardwareKeepaliveCb:Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl$HardwareKeepaliveCallback;
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;->mKeepaliveDelaySeconds:I
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;->mSocketKeepalive:Landroid/net/SocketKeepalive;
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;->onAlarmFired()V
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;->start()V
 Lcom/android/internal/net/ipsec/ike/keepalive/HardwareKeepaliveImpl;->stop()V
-Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$HardwareKeepaliveCb;-><init>(Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;Landroid/content/Context;ILjava/net/Inet4Address;Landroid/net/IpSecManager$UdpEncapsulationSocket;Landroid/app/PendingIntent;)V
+Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$Dependencies;-><init>()V
+Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$Dependencies;->createSoftwareKeepaliveImpl(Landroid/content/Context;Ljava/net/Inet4Address;Landroid/net/IpSecManager$UdpEncapsulationSocket;Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;)Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;
+Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$HardwareKeepaliveCb;-><init>(Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;Landroid/content/Context;Ljava/net/Inet4Address;Landroid/net/IpSecManager$UdpEncapsulationSocket;Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;)V
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$HardwareKeepaliveCb;->mContext:Landroid/content/Context;
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$HardwareKeepaliveCb;->mDest:Ljava/net/Inet4Address;
-Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$HardwareKeepaliveCb;->mKeepAliveAlarmIntent:Landroid/app/PendingIntent;
-Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$HardwareKeepaliveCb;->mKeepaliveDelaySeconds:I
+Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$HardwareKeepaliveCb;->mIkeAlarmConfig:Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$HardwareKeepaliveCb;->mSocket:Landroid/net/IpSecManager$UdpEncapsulationSocket;
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$HardwareKeepaliveCb;->onHardwareOffloadError()V
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$HardwareKeepaliveCb;->onNetworkError()V
@@ -3426,22 +3429,23 @@ Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$HardwareKeepalive
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$NattKeepalive;->onAlarmFired()V
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$NattKeepalive;->start()V
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$NattKeepalive;->stop()V
-Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;-><init>(Landroid/content/Context;Landroid/net/ConnectivityManager;ILjava/net/Inet4Address;Ljava/net/Inet4Address;Landroid/net/IpSecManager$UdpEncapsulationSocket;Landroid/net/Network;Landroid/app/PendingIntent;)V
+Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;-><init>(Landroid/content/Context;Landroid/net/ConnectivityManager;ILjava/net/Inet4Address;Ljava/net/Inet4Address;Landroid/net/IpSecManager$UdpEncapsulationSocket;Landroid/net/Network;Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;)V
+Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;-><init>(Landroid/content/Context;Landroid/net/ConnectivityManager;ILjava/net/Inet4Address;Ljava/net/Inet4Address;Landroid/net/IpSecManager$UdpEncapsulationSocket;Landroid/net/Network;Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$Dependencies;)V
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;->TAG:Ljava/lang/String;
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;->access$000(Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;)Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$NattKeepalive;
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;->access$002(Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$NattKeepalive;)Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$NattKeepalive;
+Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;->access$100(Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;)Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$Dependencies;
+Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;->mDeps:Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$Dependencies;
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;->mNattKeepalive:Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive$NattKeepalive;
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;->onAlarmFired()V
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;->start()V
 Lcom/android/internal/net/ipsec/ike/keepalive/IkeNattKeepalive;->stop()V
 Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;-><clinit>()V
-Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;-><init>(Landroid/content/Context;ILjava/net/Inet4Address;Landroid/net/IpSecManager$UdpEncapsulationSocket;Landroid/app/PendingIntent;)V
+Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;-><init>(Landroid/content/Context;Ljava/net/Inet4Address;Landroid/net/IpSecManager$UdpEncapsulationSocket;Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;)V
 Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;->NATT_KEEPALIVE_PAYLOAD:[B
 Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;->TAG:Ljava/lang/String;
-Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;->mAlarmMgr:Landroid/app/AlarmManager;
 Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;->mDestAddress:Ljava/net/Inet4Address;
-Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;->mKeepaliveDelayMs:J
-Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;->mKeepaliveIntent:Landroid/app/PendingIntent;
+Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;->mIkeAlarm:Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;
 Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;->mSocket:Landroid/net/IpSecManager$UdpEncapsulationSocket;
 Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;->onAlarmFired()V
 Lcom/android/internal/net/ipsec/ike/keepalive/SoftwareKeepaliveImpl;->sendKeepaliveAndScheduleNext()V
@@ -4153,6 +4157,7 @@ Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->createInitialIkeSaPay
 Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->createRekeyIkeSaRequestPayload([Landroid/net/ipsec/ike/IkeSaProposal;Lcom/android/internal/net/ipsec/ike/utils/IkeSpiGenerator;Ljava/net/InetAddress;)Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;
 Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->createRekeyIkeSaResponsePayload(BLandroid/net/ipsec/ike/IkeSaProposal;Lcom/android/internal/net/ipsec/ike/utils/IkeSpiGenerator;Ljava/net/InetAddress;)Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;
 Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->encodeToByteBuffer(ILjava/nio/ByteBuffer;)V
+Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->getNegotiatedChildProposalWithDh(Landroid/net/ipsec/ike/ChildSaProposal;Ljava/util/List;II)Landroid/net/ipsec/ike/ChildSaProposal;
 Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->getNegotiatedProposalNumber(Landroid/net/ipsec/ike/SaProposal;)B
 Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->getPayloadLength()I
 Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->getTypeString()Ljava/lang/String;
@@ -4298,6 +4303,36 @@ Lcom/android/internal/net/ipsec/ike/utils/IState;->enter()V
 Lcom/android/internal/net/ipsec/ike/utils/IState;->exit()V
 Lcom/android/internal/net/ipsec/ike/utils/IState;->getName()Ljava/lang/String;
 Lcom/android/internal/net/ipsec/ike/utils/IState;->processMessage(Landroid/os/Message;)Z
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$Dependencies;-><init>()V
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$Dependencies;->getMyUid()I
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$Dependencies;->newWakeMessage(Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;)Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;-><init>(Landroid/content/Context;Ljava/lang/String;JLandroid/app/PendingIntent;Landroid/os/Message;)V
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;->context:Landroid/content/Context;
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;->delayMs:J
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;->message:Landroid/os/Message;
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;->pendingIntent:Landroid/app/PendingIntent;
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;->tag:Ljava/lang/String;
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmWithListener;-><init>(Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$Dependencies;)V
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmWithListener;->cancel()V
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmWithListener;->mWakeupMsg:Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmWithListener;->schedule()V
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmWithPendingIntent;-><init>(Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;)V
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmWithPendingIntent;->cancel()V
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmWithPendingIntent;->mPendingIntent:Landroid/app/PendingIntent;
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmWithPendingIntent;->schedule()V
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;-><clinit>()V
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;-><init>(Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;)V
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;-><init>(Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$1;)V
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;->cancel()V
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;->mAlarmManager:Landroid/app/AlarmManager;
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;->mDelayMs:J
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;->mTag:Ljava/lang/String;
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;->newExactAlarm(Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;)Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;->newExactAlarm(Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$Dependencies;)Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;->newExactAndAllowWhileIdleAlarm(Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;)Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;->newExactAndAllowWhileIdleAlarm(Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$IkeAlarmConfig;Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$Dependencies;)Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;->sDeps:Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm$Dependencies;
+Lcom/android/internal/net/ipsec/ike/utils/IkeAlarm;->schedule()V
 Lcom/android/internal/net/ipsec/ike/utils/IkeAlarmReceiver;-><clinit>()V
 Lcom/android/internal/net/ipsec/ike/utils/IkeAlarmReceiver;-><init>()V
 Lcom/android/internal/net/ipsec/ike/utils/IkeAlarmReceiver;->ACTION_DELETE_CHILD:Ljava/lang/String;
@@ -4356,7 +4391,7 @@ Lcom/android/internal/net/ipsec/ike/utils/Retransmitter;->mRetransmissionTimeout
 Lcom/android/internal/net/ipsec/ike/utils/Retransmitter;->mRetransmitCount:I
 Lcom/android/internal/net/ipsec/ike/utils/Retransmitter;->mRetransmitMsg:Lcom/android/internal/net/ipsec/ike/message/IkeMessage;
 Lcom/android/internal/net/ipsec/ike/utils/Retransmitter;->retransmit()V
-Lcom/android/internal/net/ipsec/ike/utils/Retransmitter;->send(Lcom/android/internal/net/ipsec/ike/message/IkeMessage;)V
+Lcom/android/internal/net/ipsec/ike/utils/Retransmitter;->send()V
 Lcom/android/internal/net/ipsec/ike/utils/Retransmitter;->stopRetransmitting()V
 Lcom/android/internal/net/ipsec/ike/utils/State;-><init>()V
 Lcom/android/internal/net/ipsec/ike/utils/State;->enter()V
@@ -4568,6 +4603,24 @@ Lcom/android/internal/net/ipsec/ike/utils/StateMachine;->toString()Ljava/lang/St
 Lcom/android/internal/net/ipsec/ike/utils/StateMachine;->transitionTo(Lcom/android/internal/net/ipsec/ike/utils/IState;)V
 Lcom/android/internal/net/ipsec/ike/utils/StateMachine;->transitionToHaltingState()V
 Lcom/android/internal/net/ipsec/ike/utils/StateMachine;->unhandledMessage(Landroid/os/Message;)V
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;-><init>(Landroid/content/Context;Landroid/os/Handler;Ljava/lang/String;I)V
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;-><init>(Landroid/content/Context;Landroid/os/Handler;Ljava/lang/String;II)V
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;-><init>(Landroid/content/Context;Landroid/os/Handler;Ljava/lang/String;III)V
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;-><init>(Landroid/content/Context;Landroid/os/Handler;Ljava/lang/String;IIILjava/lang/Object;)V
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;-><init>(Landroid/content/Context;Landroid/os/Handler;Ljava/lang/String;Ljava/lang/Runnable;)V
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->cancel()V
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->getAlarmManager(Landroid/content/Context;)Landroid/app/AlarmManager;
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->mAlarmManager:Landroid/app/AlarmManager;
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->mArg1:I
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->mArg2:I
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->mCmd:I
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->mCmdName:Ljava/lang/String;
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->mHandler:Landroid/os/Handler;
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->mObj:Ljava/lang/Object;
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->mRunnable:Ljava/lang/Runnable;
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->mScheduled:Z
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->onAlarm()V,public-api,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/utils/WakeupMessage;->schedule(J)V
 Lcom/android/internal/net/org/bouncycastle/crypto/Digest;->doFinal([BI)I
 Lcom/android/internal/net/org/bouncycastle/crypto/Digest;->getAlgorithmName()Ljava/lang/String;
 Lcom/android/internal/net/org/bouncycastle/crypto/Digest;->getDigestSize()I
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 75df459..28e40fe 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 045663e..b5480f7 100644
--- a/current/sdk_library/public/android.net.ipsec.ike.srcjar
+++ b/current/sdk_library/public/android.net.ipsec.ike.srcjar