summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.prebuilt_info/prebuilt_info_current_current_zip.asciipb4
-rw-r--r--current/hiddenapi/all-flags.csv2
-rw-r--r--current/hiddenapi/stub-flags.csv2
-rw-r--r--current/sdk_library/public/android.net.ipsec.ike-stubs.jarbin41721 -> 41722 bytes
-rw-r--r--current/sdk_library/public/android.net.ipsec.ike.srcjarbin46248 -> 46444 bytes
5 files changed, 4 insertions, 4 deletions
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 1f31404..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: "7784629"
+ build_id: "7728754"
target: "mainline_modules-user"
source_file: "mainline-sdks/ipsec-module-sdk-current.zip"
}
@@ -8,7 +8,7 @@ drops {
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/IPsec"
- git_branch: "sc-qpr1-dev"
+ git_branch: "sc-v2-dev"
transform: TRANSFORM_UNZIP
transform_options {
rename {
diff --git a/current/hiddenapi/all-flags.csv b/current/hiddenapi/all-flags.csv
index 2f50a72..cbbbf33 100644
--- a/current/hiddenapi/all-flags.csv
+++ b/current/hiddenapi/all-flags.csv
@@ -2299,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
@@ -4158,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
diff --git a/current/hiddenapi/stub-flags.csv b/current/hiddenapi/stub-flags.csv
index 5c0f89d..20e4cf9 100644
--- a/current/hiddenapi/stub-flags.csv
+++ b/current/hiddenapi/stub-flags.csv
@@ -2299,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;
@@ -4158,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;
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
Binary files differ
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
Binary files differ