diff options
author | satayev <satayev@google.com> | 2022-05-19 18:49:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-19 18:49:42 +0000 |
commit | 17cb21047b86086c6b3280230773147ea0fe5e19 (patch) | |
tree | cdd0e99a329a491d78150970840df516a64eb094 | |
parent | 8f9cf64117e829d9e1869b9bdc2fb55cdc69f52a (diff) | |
parent | c538b7012a0487db24deb73a95c84b71e19ffccc (diff) | |
download | IPsec-17cb21047b86086c6b3280230773147ea0fe5e19.tar.gz |
Drop prebuilt files to android source tree. am: c538b7012a
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/IPsec/+/18491567
Change-Id: Id3453925054641a7a12a723653c2617a8eeb999b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | .prebuilt_info/prebuilt_info_current_current_zip.asciipb | 4 | ||||
-rw-r--r-- | current/hiddenapi/filtered-flags.csv | 1 | ||||
-rw-r--r-- | current/hiddenapi/filtered-stub-flags.csv | 1 | ||||
-rw-r--r-- | current/sdk_library/module-lib/android.net.ipsec.ike-stubs.jar | bin | 54792 -> 54813 bytes | |||
-rw-r--r-- | current/sdk_library/module-lib/android.net.ipsec.ike.srcjar | bin | 36472 -> 36492 bytes | |||
-rw-r--r-- | current/sdk_library/system/android.net.ipsec.ike-stubs.jar | bin | 54792 -> 54813 bytes | |||
-rw-r--r-- | current/sdk_library/system/android.net.ipsec.ike.srcjar | bin | 36472 -> 36492 bytes | |||
-rw-r--r-- | current/sdk_library/system/android.net.ipsec.ike.txt | 1 | ||||
-rw-r--r-- | current/snapshot-creation-build-number.txt | 2 |
9 files changed, 6 insertions, 3 deletions
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb index dd10ca4..9b79e47 100644 --- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb +++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb @@ -1,8 +1,8 @@ drops { android_build_drop { - build_id: "T1003987" + build_id: "T1004024" target: "train_build" - source_file: "mainline-sdks/for-latest-build/current/com.google.android.ipsec/sdk/ipsec-module-sdk-current.zip" + source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.ipsec/sdk/ipsec-module-sdk-current.zip" } dest_file: "current/current.zip" version: "" diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv index 37a3c37..56f19ff 100644 --- a/current/hiddenapi/filtered-flags.csv +++ b/current/hiddenapi/filtered-flags.csv @@ -214,6 +214,7 @@ Landroid/net/ipsec/ike/IkeSessionParams;->IKE_OPTION_EAP_ONLY_AUTH:I,public-api, Landroid/net/ipsec/ike/IkeSessionParams;->IKE_OPTION_FORCE_PORT_4500:I,public-api,sdk,system-api,test-api Landroid/net/ipsec/ike/IkeSessionParams;->IKE_OPTION_INITIAL_CONTACT:I,public-api,sdk,system-api,test-api Landroid/net/ipsec/ike/IkeSessionParams;->IKE_OPTION_MOBIKE:I,public-api,sdk,system-api,test-api +Landroid/net/ipsec/ike/IkeSessionParams;->IKE_OPTION_REKEY_MOBILITY:I,sdk,system-api,test-api Landroid/net/ipsec/ike/IkeSessionParams;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api Landroid/net/ipsec/ike/IkeSessionParams;->getConfigurationRequests()Ljava/util/List;,sdk,system-api,test-api Landroid/net/ipsec/ike/IkeSessionParams;->getDpdDelaySeconds()I,public-api,sdk,system-api,test-api diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv index 7a2f094..8a0efcb 100644 --- a/current/hiddenapi/filtered-stub-flags.csv +++ b/current/hiddenapi/filtered-stub-flags.csv @@ -214,6 +214,7 @@ Landroid/net/ipsec/ike/IkeSessionParams;->IKE_OPTION_EAP_ONLY_AUTH:I,public-api, Landroid/net/ipsec/ike/IkeSessionParams;->IKE_OPTION_FORCE_PORT_4500:I,public-api,system-api,test-api Landroid/net/ipsec/ike/IkeSessionParams;->IKE_OPTION_INITIAL_CONTACT:I,public-api,system-api,test-api Landroid/net/ipsec/ike/IkeSessionParams;->IKE_OPTION_MOBIKE:I,public-api,system-api,test-api +Landroid/net/ipsec/ike/IkeSessionParams;->IKE_OPTION_REKEY_MOBILITY:I,system-api,test-api Landroid/net/ipsec/ike/IkeSessionParams;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api Landroid/net/ipsec/ike/IkeSessionParams;->getConfigurationRequests()Ljava/util/List;,system-api,test-api Landroid/net/ipsec/ike/IkeSessionParams;->getDpdDelaySeconds()I,public-api,system-api,test-api diff --git a/current/sdk_library/module-lib/android.net.ipsec.ike-stubs.jar b/current/sdk_library/module-lib/android.net.ipsec.ike-stubs.jar Binary files differindex bf72869..621137a 100644 --- a/current/sdk_library/module-lib/android.net.ipsec.ike-stubs.jar +++ b/current/sdk_library/module-lib/android.net.ipsec.ike-stubs.jar diff --git a/current/sdk_library/module-lib/android.net.ipsec.ike.srcjar b/current/sdk_library/module-lib/android.net.ipsec.ike.srcjar Binary files differindex fdb577e..bc5112e 100644 --- a/current/sdk_library/module-lib/android.net.ipsec.ike.srcjar +++ b/current/sdk_library/module-lib/android.net.ipsec.ike.srcjar diff --git a/current/sdk_library/system/android.net.ipsec.ike-stubs.jar b/current/sdk_library/system/android.net.ipsec.ike-stubs.jar Binary files differindex bf72869..621137a 100644 --- a/current/sdk_library/system/android.net.ipsec.ike-stubs.jar +++ b/current/sdk_library/system/android.net.ipsec.ike-stubs.jar diff --git a/current/sdk_library/system/android.net.ipsec.ike.srcjar b/current/sdk_library/system/android.net.ipsec.ike.srcjar Binary files differindex fdb577e..bc5112e 100644 --- a/current/sdk_library/system/android.net.ipsec.ike.srcjar +++ b/current/sdk_library/system/android.net.ipsec.ike.srcjar diff --git a/current/sdk_library/system/android.net.ipsec.ike.txt b/current/sdk_library/system/android.net.ipsec.ike.txt index f09f33d..f82978d 100644 --- a/current/sdk_library/system/android.net.ipsec.ike.txt +++ b/current/sdk_library/system/android.net.ipsec.ike.txt @@ -65,6 +65,7 @@ package android.net.ipsec.ike { method @IntRange(from=0x0, to=0x3f) public int getDscp(); method @Nullable public android.net.ipsec.ike.ike3gpp.Ike3gppExtension getIke3gppExtension(); method @Deprecated @NonNull public java.util.List<android.net.ipsec.ike.IkeSaProposal> getSaProposals(); + field public static final int IKE_OPTION_REKEY_MOBILITY = 5; // 0x5 } public static final class IkeSessionParams.Builder { diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt index 15de0ce..76be850 100644 --- a/current/snapshot-creation-build-number.txt +++ b/current/snapshot-creation-build-number.txt @@ -1 +1 @@ -8559462
\ No newline at end of file +8605353
\ No newline at end of file |