summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKatya Bychkouskaya <kbychkouskaya@google.com>2023-08-13 14:19:55 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-08-13 14:19:55 +0000
commit8b3ba44d025b93380816ccfd104b592ea471bdcf (patch)
treeb2165ddf2d8241bdff395d54b668c20ba8f057e3
parent8628886681569f525253857420d7e9eb75698ce6 (diff)
parentb25eeac33702d60efd31cb82ad2ef58935707cfc (diff)
downloadIPsec-8b3ba44d025b93380816ccfd104b592ea471bdcf.tar.gz
DO NOT MERGE: Drop prebuilt files to android source tree. am: b25eeac337
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/IPsec/+/24372061 Change-Id: I93c6d06da55d2e6d6add7adc72f49cb6e6318b2f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--.prebuilt_info/prebuilt_info_current_current_zip.asciipb4
-rw-r--r--current/hiddenapi/filtered-flags.csv1
-rw-r--r--current/hiddenapi/filtered-stub-flags.csv1
-rw-r--r--current/snapshot-creation-build-number.txt2
4 files changed, 5 insertions, 3 deletions
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 29f74f2..9e6b4c4 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: "T1007458"
+ build_id: "T1007601"
target: "train_build"
source_file: "mainline-sdks/for-UpsideDownCake-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: "udc-dev"
+ git_branch: "udc-d1-dev"
transform: TRANSFORM_UNZIP
transform_options {
}
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index 9db51ce..3bab121 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -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/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index a719631..a3490ca 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -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/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 6bd78b7..421f01b 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10541443 \ No newline at end of file
+10612203 \ No newline at end of file