Revert "Drop prebuilt files to android source tree."

Revert "Drop prebuilt files to android source tree."

Revert "Drop prebuilt files to android source tree."

Revert "Drop prebuilt files to android source tree."

Revert "Drop prebuilt files to android source tree."

Revert "Drop prebuilt files to android source tree."

Revert "Drop prebuilt files to android source tree."

Revert submission 19676048-b/238423099

Reason for revert: multiple presubmit test failures
Reverted Changes:
If1ea6bc02:Drop prebuilt files to android source tree.
I00096529f:Drop prebuilt files to android source tree.
Ic880a64de:Drop prebuilt files to android source tree.
I73a0e21bd:Drop prebuilt files to android source tree.
Ib05de9612:Drop prebuilt files to android source tree.
Ib000b0311:Drop prebuilt files to android source tree.
I207854b91:Drop prebuilt files to android source tree.
Ib61981f79:Drop prebuilt files to android source tree.
I2465ab127:Drop prebuilt files to android source tree.
Ibdf3b6aa8:Drop prebuilt files to android source tree.
I18963eb36:Drop prebuilt files to android source tree.
Ic165aaee7:Drop prebuilt files to android source tree.
Ieeda50a98:Drop prebuilt files to android source tree.
Iafe52654d:Drop prebuilt files to android source tree.
I752df74c3:Drop prebuilt files to android source tree.
Ic5ffbe97e:Drop prebuilt files to android source tree.
Ib591ad65e:Drop prebuilt files to android source tree.
If1b95e486:Drop prebuilt files to android source tree.
I781d35227:Drop prebuilt files to android source tree.
I9fc25eaa8:Drop prebuilt files to android source tree.
I60eab0969:Drop prebuilt files to android source tree.
I12a25fa01:Drop prebuilt files to android source tree.
I8a292d5c2:Drop prebuilt files to android source tree.
I9d8758342:Drop prebuilt files to android source tree.
I87b4c0be0:Drop prebuilt files to android source tree.
I3c54aa2bb:Drop prebuilt files to android source tree.
I04556a840:Drop prebuilt files to android source tree.
If360766c3:Drop prebuilt files to android source tree.
Ib8a142caa:Drop prebuilt files to android source tree.
I4c3ff01d6:Drop prebuilt files to android source tree.
I2b2c12405:Drop prebuilt files to android source tree.
I4bb9fccb1:Drop prebuilt files to android source tree.
Ifb921cfbe:Drop prebuilt files to android source tree.
I2229734a3:Drop prebuilt files to android source tree.
Iab486cbcb:Drop prebuilt files to android source tree.
I5708756d3:Drop prebuilt files to android source tree.
Ie131fdec8:Drop prebuilt files to android source tree.
I3a75319fe:Drop prebuilt files to android source tree.
I198f91e34:Drop prebuilt files to android source tree.
I9f2d419f9:Drop prebuilt files to android source tree.
I4b89e9c99:Drop prebuilt files to android source tree.
I79e547f2b:Drop prebuilt files to android source tree.
Ibc93421dc:Drop prebuilt files to android source tree.
Ib6ed2bba2:Drop prebuilt files to android source tree.

Change-Id: I41ecf088ae9c7a7504963d3f66eb7e514ba8c72d

10 files changed, 129 insertions, 38 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 15e559b..a17838a 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: "T1004614"
+    build_id: "T1004275"
     target: "train_build"
     source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.ipsec/sdk/ipsec-module-sdk-current.zip"
   }
@@ -8,7 +8,7 @@ drops {
   version: ""
   version_group: ""
   git_project: "platform/prebuilts/module_sdk/IPsec"
-  git_branch: "master"
+  git_branch: "tm-dev"
   transform: TRANSFORM_UNZIP
   transform_options {
   }
diff --git a/current/Android.bp b/current/Android.bp
index e78608f..deb6067 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -1,5 +1,14 @@
 // This is auto-generated. DO NOT EDIT.
 
+// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
+soong_config_module_type_import {
+    from: "packages/modules/common/Android.bp",
+    module_types: [
+        "module_java_sdk_library_import",
+        "module_prebuilt_bootclasspath_fragment",
+    ],
+}
+
 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.
@@ -7,11 +16,40 @@ package {
 }
 
 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"],
+    fragments: [
+        {
+            apex: "com.android.art",
+            module: "art-bootclasspath-fragment",
+        },
+        {
+            apex: "com.android.tethering",
+            module: "com.android.tethering-bootclasspath-fragment",
+        },
+    ],
+    hidden_api: {
+        annotation_flags: "hiddenapi/annotation-flags.csv",
+        metadata: "hiddenapi/metadata.csv",
+        index: "hiddenapi/index.csv",
+        signature_patterns: "hiddenapi/signature-patterns.csv",
+        filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv",
+        filtered_flags: "hiddenapi/filtered-flags.csv",
+    },
+}
+
+module_prebuilt_bootclasspath_fragment {
     name: "com.android.ipsec-bootclasspath-fragment",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
-    use_source_config_var: {
-        config_namespace: "ANDROID",
-        var_name: "module_build_from_source",
+    prefer: true,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
     },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.ipsec"],
@@ -38,11 +76,55 @@ prebuilt_bootclasspath_fragment {
 }
 
 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",
+        annotations: "sdk_library/public/android.net.ipsec.ike_annotations.zip",
+        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",
+        annotations: "sdk_library/system/android.net.ipsec.ike_annotations.zip",
+        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",
+        annotations: "sdk_library/module-lib/android.net.ipsec.ike_annotations.zip",
+        sdk_version: "module_current",
+    },
+}
+
+module_java_sdk_library_import {
     name: "android.net.ipsec.ike",
     // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
-    use_source_config_var: {
-        config_namespace: "ANDROID",
-        var_name: "module_build_from_source",
+    prefer: true,
+    soong_config_variables: {
+        module_build_from_source: {
+            prefer: false,
+        },
     },
     visibility: ["//visibility:public"],
     apex_available: [
@@ -84,8 +166,23 @@ java_sdk_library_import {
 }
 
 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/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index 8843eb0..56f19ff 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -484,11 +484,8 @@ Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload$PrfTransform;->toString
 Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload$Proposal;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onAvailable(Landroid/net/Network;)V,public-api,sdk,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V,public-api,sdk,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,sdk,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/net/IkeNetworkCallbackBase;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/net/IkeNetworkCallbackBase;->onLost(Landroid/net/Network;)V,public-api,sdk,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/net/IkeSpecificNetworkCallback;->onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V,public-api,sdk,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/net/IkeSpecificNetworkCallback;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->generateSeed(I)[B,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->getAlgorithm()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->nextBytes([B)V,core-platform-api,public-api,sdk,system-api,test-api
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index e128c85..8a0efcb 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -484,11 +484,8 @@ Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload$PrfTransform;->toString
 Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload$Proposal;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/message/IkeSaPayload;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onAvailable(Landroid/net/Network;)V,public-api,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V,public-api,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/net/IkeDefaultNetworkCallback;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/net/IkeNetworkCallbackBase;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/net/IkeNetworkCallbackBase;->onLost(Landroid/net/Network;)V,public-api,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/net/IkeSpecificNetworkCallback;->onCapabilitiesChanged(Landroid/net/Network;Landroid/net/NetworkCapabilities;)V,public-api,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/net/IkeSpecificNetworkCallback;->onLinkPropertiesChanged(Landroid/net/Network;Landroid/net/LinkProperties;)V,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->generateSeed(I)[B,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->getAlgorithm()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Lcom/android/internal/net/ipsec/ike/testmode/DeterministicSecureRandom;->nextBytes([B)V,core-platform-api,public-api,system-api,test-api
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index 6edb40a..fc2ea5c 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -4,24 +4,24 @@ Lcom/android/internal/util/HexDump;->toHexString([BZ)Ljava/lang/String;,framewor
 Lcom/android/internal/util/HexDump;->toHexString([BII)Ljava/lang/String;,frameworks/base/core/java/com/android/internal/util/HexDump.java,116,5,116,25,
 Lcom/android/internal/util/HexDump;->toHexString(I)Ljava/lang/String;,frameworks/base/core/java/com/android/internal/util/HexDump.java,138,5,138,25,
 Lcom/android/internal/util/HexDump;->hexStringToByteArray(Ljava/lang/String;)[B,frameworks/base/core/java/com/android/internal/util/HexDump.java,172,5,172,25,
-Lcom/android/internal/util/IState;->getName()Ljava/lang/String;,frameworks/libs/modules-utils/java/com/android/internal/util/IState.java,71,5,71,25,
-Lcom/android/internal/util/State;-><init>()V,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,35,5,35,25,
-Lcom/android/internal/util/State;->enter()V,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,42,5,42,25,
-Lcom/android/internal/util/State;->exit()V,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,50,5,50,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/State;->processMessage(Landroid/os/Message;)Z,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,58,5,58,25,
-Lcom/android/internal/util/State;->getName()Ljava/lang/String;,frameworks/libs/modules-utils/java/com/android/internal/util/State.java,76,5,76,25,
-Lcom/android/internal/util/StateMachine;-><init>(Ljava/lang/String;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1304,5,1304,25,
-Lcom/android/internal/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Looper;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1318,5,1318,25,
-Lcom/android/internal/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Handler;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1328,5,1328,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->addState(Lcom/android/internal/util/State;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1361,5,1361,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->setInitialState(Lcom/android/internal/util/State;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1380,5,1380,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->transitionTo(Lcom/android/internal/util/IState;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1419,5,1419,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->obtainMessage(III)Landroid/os/Message;,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1684,5,1684,25,
-Lcom/android/internal/util/StateMachine;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1704,5,1704,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->sendMessage(I)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1714,5,1714,25,
-Lcom/android/internal/util/StateMachine;->sendMessage(ILjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1728,5,1728,25,
-Lcom/android/internal/util/StateMachine;->sendMessage(II)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1742,5,1742,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->sendMessage(IIILjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1769,5,1769,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->sendMessage(Landroid/os/Message;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1783,5,1783,25,
-Lcom/android/internal/util/StateMachine;->start()V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,2070,5,2070,88,maxTargetSdk=30&trackingBug=170729553L
-Lcom/android/internal/util/StateMachine;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,2087,5,2087,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/IState;->getName()Ljava/lang/String;,frameworks/base/core/java/com/android/internal/util/IState.java,71,5,71,25,
+Lcom/android/internal/util/State;-><init>()V,frameworks/base/core/java/com/android/internal/util/State.java,35,5,35,25,
+Lcom/android/internal/util/State;->enter()V,frameworks/base/core/java/com/android/internal/util/State.java,42,5,42,25,
+Lcom/android/internal/util/State;->exit()V,frameworks/base/core/java/com/android/internal/util/State.java,50,5,50,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/State;->processMessage(Landroid/os/Message;)Z,frameworks/base/core/java/com/android/internal/util/State.java,58,5,58,25,
+Lcom/android/internal/util/State;->getName()Ljava/lang/String;,frameworks/base/core/java/com/android/internal/util/State.java,76,5,76,25,
+Lcom/android/internal/util/StateMachine;-><init>(Ljava/lang/String;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1304,5,1304,25,
+Lcom/android/internal/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Looper;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1318,5,1318,25,
+Lcom/android/internal/util/StateMachine;-><init>(Ljava/lang/String;Landroid/os/Handler;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1328,5,1328,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->addState(Lcom/android/internal/util/State;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1361,5,1361,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->setInitialState(Lcom/android/internal/util/State;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1380,5,1380,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->transitionTo(Lcom/android/internal/util/IState;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1419,5,1419,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->obtainMessage(III)Landroid/os/Message;,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1684,5,1684,25,
+Lcom/android/internal/util/StateMachine;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1704,5,1704,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->sendMessage(I)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1714,5,1714,25,
+Lcom/android/internal/util/StateMachine;->sendMessage(ILjava/lang/Object;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1728,5,1728,25,
+Lcom/android/internal/util/StateMachine;->sendMessage(II)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1742,5,1742,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->sendMessage(IIILjava/lang/Object;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1769,5,1769,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->sendMessage(Landroid/os/Message;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,1783,5,1783,25,
+Lcom/android/internal/util/StateMachine;->start()V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,2070,5,2070,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V,frameworks/base/core/java/com/android/internal/util/StateMachine.java,2087,5,2087,88,maxTargetSdk=30&trackingBug=170729553L
diff --git a/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip b/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip
index 64096c4..516231a 100644
--- a/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip
+++ b/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip
diff --git a/current/sdk_library/public/android.net.ipsec.ike-stubs.jar b/current/sdk_library/public/android.net.ipsec.ike-stubs.jar
index 5a347bc..29b0ab3 100644
--- a/current/sdk_library/public/android.net.ipsec.ike-stubs.jar
+++ b/current/sdk_library/public/android.net.ipsec.ike-stubs.jar
diff --git a/current/sdk_library/public/android.net.ipsec.ike.srcjar b/current/sdk_library/public/android.net.ipsec.ike.srcjar
index eac8fd1..05323cd 100644
--- a/current/sdk_library/public/android.net.ipsec.ike.srcjar
+++ b/current/sdk_library/public/android.net.ipsec.ike.srcjar
diff --git a/current/sdk_library/system/android.net.ipsec.ike_annotations.zip b/current/sdk_library/system/android.net.ipsec.ike_annotations.zip
index 64096c4..516231a 100644
--- a/current/sdk_library/system/android.net.ipsec.ike_annotations.zip
+++ b/current/sdk_library/system/android.net.ipsec.ike_annotations.zip
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 08c739a..086f8b2 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-8945221
\ No newline at end of file
+8762336
\ No newline at end of file