summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinod Pavan Kumar Idapalapati <vpkumar@google.com>2023-12-13 19:07:34 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-13 19:07:34 +0000
commit44c7dcb1e265b09dc8ecfd550a96e2afd0f487aa (patch)
tree2bf1a932ab5dc4dd723e4e0d9240c8f2d68c6a90
parentbf558661dfe6dee7c7031af8aa90287d69688666 (diff)
parentd098d101d9d7626a3b35761d1e70d0261a27429a (diff)
downloadIPsec-44c7dcb1e265b09dc8ecfd550a96e2afd0f487aa.tar.gz
DO NOT MERGE: Drop prebuilt files to android source tree. am: d098d101d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/IPsec/+/25487651 Change-Id: I8caac47b7b432ce6e53ec9e3b60a459cc9684cf0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb4
-rw-r--r--go/current/hiddenapi/filtered-flags.csv3
-rw-r--r--go/current/hiddenapi/filtered-stub-flags.csv3
-rw-r--r--go/current/hiddenapi/index.csv30
-rw-r--r--go/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zipbin3119 -> 3059 bytes
-rw-r--r--go/current/sdk_library/system/android.net.ipsec.ike_annotations.zipbin2975 -> 2915 bytes
-rw-r--r--go/current/snapshot-creation-build-number.txt2
7 files changed, 22 insertions, 20 deletions
diff --git a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
index 6842269..9947176 100644
--- a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "T1007188"
+ build_id: "T1008598"
target: "train_build"
source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.go.ipsec/sdk/ipsec-module-sdk-current.zip"
}
@@ -8,7 +8,7 @@ drops {
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/IPsec"
- git_branch: "udc-dev"
+ git_branch: "udc-qpr-dev"
transform: TRANSFORM_UNZIP
transform_options {
}
diff --git a/go/current/hiddenapi/filtered-flags.csv b/go/current/hiddenapi/filtered-flags.csv
index 9db51ce..e781b90 100644
--- a/go/current/hiddenapi/filtered-flags.csv
+++ b/go/current/hiddenapi/filtered-flags.csv
@@ -401,7 +401,7 @@ Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteDel
Lcom/android/internal/net/ipsec/ike/IkeLocalRequestScheduler$LocalRequestComparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,sdk,system-api,test-api
Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeAuthFirstAndLastExchangeBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$DeleteIkeLocalDelete$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$DeleteResponderBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
@@ -490,6 +490,7 @@ Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSynthet
Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$Ipv6AddrInfo;->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
diff --git a/go/current/hiddenapi/filtered-stub-flags.csv b/go/current/hiddenapi/filtered-stub-flags.csv
index a719631..2b505f3 100644
--- a/go/current/hiddenapi/filtered-stub-flags.csv
+++ b/go/current/hiddenapi/filtered-stub-flags.csv
@@ -401,7 +401,7 @@ Lcom/android/internal/net/ipsec/ike/ChildSessionStateMachine$RekeyChildRemoteDel
Lcom/android/internal/net/ipsec/ike/IkeLocalRequestScheduler$LocalRequestComparator;->compare(Ljava/lang/Object;Ljava/lang/Object;)I,core-platform-api,public-api,system-api,test-api
Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
-Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$CreateIkeLocalIkeAuthFirstAndLastExchangeBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$DeleteIkeLocalDelete$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
Lcom/android/internal/net/ipsec/ike/IkeSessionStateMachine$DeleteResponderBase$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
@@ -490,6 +490,7 @@ Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSynthet
Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
+Lcom/android/internal/net/ipsec/ike/net/IkeConnectionController$Ipv6AddrInfo;->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
diff --git a/go/current/hiddenapi/index.csv b/go/current/hiddenapi/index.csv
index 6edb40a..d875248 100644
--- a/go/current/hiddenapi/index.csv
+++ b/go/current/hiddenapi/index.csv
@@ -10,18 +10,18 @@ Lcom/android/internal/util/State;->enter()V,frameworks/libs/modules-utils/java/c
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/StateMachine;-><init>(Ljava/lang/String;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1303,5,1303,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,1317,5,1317,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,1327,5,1327,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,1360,5,1360,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,1379,5,1379,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,1418,5,1418,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,1683,5,1683,25,
+Lcom/android/internal/util/StateMachine;->obtainMessage(IIILjava/lang/Object;)Landroid/os/Message;,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1703,5,1703,88,maxTargetSdk=30&trackingBug=170729553L
+Lcom/android/internal/util/StateMachine;->sendMessage(I)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1713,5,1713,25,
+Lcom/android/internal/util/StateMachine;->sendMessage(ILjava/lang/Object;)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1727,5,1727,25,
+Lcom/android/internal/util/StateMachine;->sendMessage(II)V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,1741,5,1741,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,1768,5,1768,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,1782,5,1782,25,
+Lcom/android/internal/util/StateMachine;->start()V,frameworks/libs/modules-utils/java/com/android/internal/util/StateMachine.java,2069,5,2069,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,2086,5,2086,88,maxTargetSdk=30&trackingBug=170729553L
diff --git a/go/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip b/go/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip
index 3560433..f6a81e6 100644
--- a/go/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip
+++ b/go/current/sdk_library/module-lib/android.net.ipsec.ike_annotations.zip
Binary files differ
diff --git a/go/current/sdk_library/system/android.net.ipsec.ike_annotations.zip b/go/current/sdk_library/system/android.net.ipsec.ike_annotations.zip
index 96e3825..d380937 100644
--- a/go/current/sdk_library/system/android.net.ipsec.ike_annotations.zip
+++ b/go/current/sdk_library/system/android.net.ipsec.ike_annotations.zip
Binary files differ
diff --git a/go/current/snapshot-creation-build-number.txt b/go/current/snapshot-creation-build-number.txt
index f9eedbc..3b15772 100644
--- a/go/current/snapshot-creation-build-number.txt
+++ b/go/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10414058 \ No newline at end of file
+10488397 \ No newline at end of file