aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-11-29Snap for 11151698 from ef21bd2a9b784a5e717b5d92b205917b5e9226f5 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseAndroid Build Coastguard Worker
Change-Id: I5a8eae110a29785a145a5f3f85bca307785500ad
2023-11-28Merge "Migrate to cargo_embargo." into main am: 0e411603ce am: 33bf951a0d ↵Treehugger Robot
am: 2e4c6dd481 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2848257 Change-Id: Id2fddc8582cce1f0791f6b5b0e0faa399fa61921 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "Migrate to cargo_embargo." into main am: 0e411603ce am: c01715ae95 ↵Treehugger Robot
am: 46352499b2 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2848257 Change-Id: I97d951dcaa57f94c29037ce5058cc193153729fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "Remove patch which no longer applies. am: b3b7270dc3 am: 83d544573e" ↵Automerger Merge Worker
into udc-qpr-dev-plus-aosp am: 0d5c169979 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2848256 Change-Id: Ifda48601ff4d53be91faeb49472743655459327d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Remove patch which no longer applies. am: b3b7270dc3 am: f8a4436f38 am: ↵Andrew Walbran
ce22f63d0e Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2848256 Change-Id: I12c01e5e77fb8abf36d13ba2647851fdca01c0a7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "Migrate to cargo_embargo." into main am: 0e411603ce am: 33bf951a0dTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2848257 Change-Id: Ifdeb5f0aeeaa03c99b31239b88ded6d00ce1d45f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "Migrate to cargo_embargo." into main am: 0e411603ce am: c01715ae95Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2848257 Change-Id: I2c103fef2451cae6d7b0a5edc05034d526168dc8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "Remove patch which no longer applies. am: b3b7270dc3 am: 83d544573e" ↵Automerger Merge Worker
into udc-qpr-dev-plus-aosp
2023-11-28Remove patch which no longer applies. am: b3b7270dc3 am: 83d544573eAndrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2848256 Change-Id: I15caf25740364acdf887969ed4f294c7814de06b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Remove patch which no longer applies. am: b3b7270dc3 am: f8a4436f38Andrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2848256 Change-Id: Ic7bc6c8c3bcd0009f75fe4c49550815fad679b09 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "Migrate to cargo_embargo." into main am: 0e411603ceTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2848257 Change-Id: Id468cce91bbc1647abb7ce04079692ea4cece169 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Remove patch which no longer applies. am: b3b7270dc3Andrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2848256 Change-Id: I74dff957260bee87b26ebdda836a4badfcf6d35e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "Migrate to cargo_embargo." into main am: 0e411603ceTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2848257 Change-Id: I2407520a284762d8af89a8254c33472987814189 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Remove patch which no longer applies. am: b3b7270dc3Andrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2848256 Change-Id: Ib56a5881599217ce110436c391589f0a514d748a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Merge "Migrate to cargo_embargo." into mainTreehugger Robot
2023-11-28Migrate to cargo_embargo.Andrew Walbran
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: Id047e55002068cb8e044681498da1666a929314b
2023-11-22Remove patch which no longer applies.Andrew Walbran
This doesn't apply to the current version, and is no longer needed. Test: Tried to apply the patch, it didn't apply in either direction. Change-Id: Ib38618e8a190498d467a6865bc355da7fe04a313
2023-07-18Move OWNER reference master=>main. am: 0b59130098 am: d1041c2df3 am: ↵Sam Saccone
10eae89cdd am: 69ee50ebfa am: 420ff5d4e4 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2662721 Change-Id: Ie7a6b871751a5ef542d443fd2c644bc260e9010c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Move OWNER reference master=>main. am: 0b59130098 am: d1041c2df3 am: ↵Sam Saccone
10eae89cdd am: 69ee50ebfa Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2662721 Change-Id: I0f95f745f3e0271c2bb25e3f861700ccf4a23ce2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Move OWNER reference master=>main. am: 0b59130098 am: d1041c2df3 am: 10eae89cddSam Saccone
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2662721 Change-Id: Ie0e6ae8c276a9d81c1da613f7e57c25ee8cbd584 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Move OWNER reference master=>main. am: 0b59130098 am: d1041c2df3Sam Saccone
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2662721 Change-Id: I0ca2d1c66d45960ba6262d38ad4091904d0dc789 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Move OWNER reference master=>main. am: 0b59130098Sam Saccone
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2662721 Change-Id: I1cf04e272f171ddb2d1ab97efa17a8c0e7700c8a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Move OWNER reference master=>main.Sam Saccone
BUG=b/291759353 Change-Id: I782b022456d13a343e90c1e7dd70c6dd12a3f52f
2023-04-28[automerger skipped] Upgrade quiche to 0.17.1 am: 6f1ccfeebf am: ef9d73128c ↵Mike Yu
am: 2e3efcecef -s ours am: eb80234b9e -s ours am: df6c5c5402 -s ours am skip reason: Merged-In I87acbb95e943eb41e89c56acf470cf6de6254dbe with SHA-1 fa78f72852 is already in history Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2535585 Change-Id: Iff59b21f8775a0fb8b32ecc154ead1b6072cb567 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27[automerger skipped] Upgrade quiche to 0.17.1 am: 6f1ccfeebf am: ef9d73128c ↵Mike Yu
am: 2e3efcecef -s ours am: eb80234b9e -s ours am skip reason: Merged-In I87acbb95e943eb41e89c56acf470cf6de6254dbe with SHA-1 fa78f72852 is already in history Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2535585 Change-Id: Ie5e64ade05aa88edaa250d32b3265b58805a8011 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27[automerger skipped] Upgrade quiche to 0.17.1 am: 6f1ccfeebf am: ef9d73128c ↵Mike Yu
am: 2e3efcecef -s ours am skip reason: Merged-In I87acbb95e943eb41e89c56acf470cf6de6254dbe with SHA-1 fa78f72852 is already in history Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2535585 Change-Id: I34c3c25b9f99dd650fa37be47058ee619266b7d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27Upgrade quiche to 0.17.1 am: 6f1ccfeebf am: ef9d73128cMike Yu
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2535585 Change-Id: I7c75c37c02fd3dbeb589304b49308cab4ee840e3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27Upgrade quiche to 0.17.1 am: 6f1ccfeebfMike Yu
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2535585 Change-Id: I119c61bd9fc39e1ceac7f642ed1b237a2e625114 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26Upgrade quiche to 0.17.1 am: fa78f72852 am: 157ae4072b am: 3286d55b85Mike Yu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/22746627 Change-Id: I75d4cb0e8f12df20a0c43b89dc367c7e22e4109e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26Upgrade quiche to 0.17.1 am: fa78f72852 am: ac8506a25e am: f06c91f863Mike Yu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/22746627 Change-Id: Ia21cb01a6c9e734364291c9f699d75901c0e43a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26Upgrade quiche to 0.17.1 am: fa78f72852 am: 157ae4072bMike Yu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/22746627 Change-Id: Id9297ef3c9bc277faba1c7ebd1e458479b7633ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26Upgrade quiche to 0.17.1 am: fa78f72852 am: 015bb821e8Mike Yu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/22746627 Change-Id: I3eb74dec593f80e3d913257a01d7c55d673f419a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26Upgrade quiche to 0.17.1 am: fa78f72852 am: ac8506a25eMike Yu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/22746627 Change-Id: If790bde65ec9fa3113d0e514d195b336b3c5c3e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26Upgrade quiche to 0.17.1 am: fa78f72852android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseMike Yu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/22746627 Change-Id: I55a5e07a573ca758a568bf4c1a3e599a4441bd3d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26Upgrade quiche to 0.17.1 am: fa78f72852Mike Yu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/22746627 Change-Id: I927bd9e0f8cd3b12e773bca585200518284c4443 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26Upgrade quiche to 0.17.1 am: fa78f72852Mike Yu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/22746627 Change-Id: I1076dee594397bbcc6377ec6cce3862ee24881ab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25Upgrade quiche to 0.17.1Mike Yu
This change is made by the following steps: $ rm patches/Initial-stateless-reset-detection.patch patches/Android.bp.patch $ ../../../../tools/external_updater/updater.sh update rust/crates/quiche $ (add a new Android.bp.patch in patches/) $ cargo2android.py --config cargo2android.json $ rm -rf cargo.out target.tmp/ Bug: 277315978 Test: cd external/rust/crates/quiche && atest Test: cd packages/modules/DnsResolver && atest Change-Id: I87acbb95e943eb41e89c56acf470cf6de6254dbe Merged-In: I87acbb95e943eb41e89c56acf470cf6de6254dbe
2023-04-21Upgrade quiche to 0.17.1android14-devMike Yu
This change is made by the following steps: $ rm patches/Initial-stateless-reset-detection.patch patches/Android.bp.patch $ ../../../../tools/external_updater/updater.sh update rust/crates/quiche $ (add a new Android.bp.patch in patches/) $ cargo2android.py --config cargo2android.json $ rm -rf cargo.out target.tmp/ Bug: 277315978 Ignore-AOSP-First: Can't merge the quiche-0.17.1 upgrade in AOSP first because the code change in external/rust/crates/quiche doesn't automerge into udc-mainline-prod (the code change in packages/modules/DnsResolver does). Will cherry-pick the change to AOSP after this change mergers into master. Test: cd external/rust/crates/quiche && atest Test: cd packages/modules/DnsResolver && atest Change-Id: I87acbb95e943eb41e89c56acf470cf6de6254dbe (cherry picked from commit 794f6f0480f0e5b71486e48c776bfb9b8bc77998)
2023-02-03[automerged blank] Initial stateless reset detection 2p: 4f353252ffMike Yu
Blank merge reason: Change-Id Ife933f54ac6ec1098a9046673ca200c6b4e2ebbf with SHA-1 e1d5b66375 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/21262331 Bug: 242832641 Bug: 245074765 Bug: 258767218 Change-Id: Idb88a09171f5b2b3095ff9d70e48aae0d7d6fd0d Merged-In: Ife933f54ac6ec1098a9046673ca200c6b4e2ebbf
2023-02-03Initial stateless reset detectionMike Yu
Backport the stateless reset patch to AOSP (current version of quiche is 0.14.0) so that we don't need to wait until the patch is released to a quiche version newer than 0.16.0 (currently, the latest version is 0.16.0). This patch is slightly modified because the type of stateless_reset_token is different (In 0.14.0 the type is Option<Vec<u8>>; in 0.16.0 the type is Option<u128>). Source patch: https://github.com/cloudflare/quiche/commit/c6357db0b5311010e266637eda2f645b7fa91df4. Bug: 242832641 Bug: 245074765 Bug: 258767218 Test: cd packages/modules/DnsResolver && atest Test: cd external/rust/crates/quiche && atest Test: 1. Applied ag/20124672 to DnsResolver 2. Ran dnschk every 5 minutes for 1 hour 3. Checked the log: a. Confirmed that some stateless reset packets were received b. Confirmed that DNS queries fallback'ed to DoT immediately after DnsResolver received stateless reset packets Change-Id: Ife933f54ac6ec1098a9046673ca200c6b4e2ebbf (cherry picked from commit e1d5b663756184f5737c886a01cfa519ef256508) Merged-In: Ife933f54ac6ec1098a9046673ca200c6b4e2ebbf
2023-02-03Initial stateless reset detection am: e1d5b66375 am: eea8ca9dc8 am: bc84d7fe6aMike Yu
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2411180 Change-Id: Iad67f209507fdfa9a3756d5f1e988bb16ffdfe87 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-03Initial stateless reset detection am: e1d5b66375 am: eea8ca9dc8Mike Yu
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2411180 Change-Id: I9033fe184139cfa8c4d818ed28ecd7266850437f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-03Initial stateless reset detection am: e1d5b66375android-u-beta-1-gplMike Yu
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2411180 Change-Id: Ie78af399f1dfe2c64eeabafe65662b4421c3a135 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02Initial stateless reset detectionMike Yu
Backport the stateless reset patch to AOSP (current version of quiche is 0.14.0) so that we don't need to wait until the patch is released to a quiche version newer than 0.16.0 (currently, the latest version is 0.16.0). This patch is slightly modified because the type of stateless_reset_token is different (In 0.14.0 the type is Option<Vec<u8>>; in 0.16.0 the type is Option<u128>). Source patch: https://github.com/cloudflare/quiche/commit/c6357db0b5311010e266637eda2f645b7fa91df4. Bug: 242832641 Bug: 245074765 Bug: 258767218 Test: cd packages/modules/DnsResolver && atest Test: cd external/rust/crates/quiche && atest Test: 1. Applied ag/20124672 to DnsResolver 2. Ran dnschk every 5 minutes for 1 hour 3. Checked the log: a. Confirmed that some stateless reset packets were received b. Confirmed that DNS queries fallback'ed to DoT immediately after DnsResolver received stateless reset packets Change-Id: Ife933f54ac6ec1098a9046673ca200c6b4e2ebbf
2023-01-31Update TEST_MAPPING am: 9a47994fc7 am: f009645cdc am: 1443fcc38aJeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2411874 Change-Id: I9d4feddf9ce5f03c08dfbcbc545939f51b5480e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31Update TEST_MAPPING am: 9a47994fc7 am: f009645cdcJeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2411874 Change-Id: I34094e7870ba3e1749df41d5fe10ed5d60925ffc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31Update TEST_MAPPING am: 9a47994fc7Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2411874 Change-Id: I526879f1dec93b92d3b4911b2c91d5cbd93a8a14 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-30Update TEST_MAPPINGJeff Vander Stoep
Test: atest Change-Id: I027491b3d267548cd4b779649ea9cc4645401e36
2022-12-08[automerger skipped] Upgrade quiche to 0.14.0 am: 21aebcb8b9 am: 747fd9a206 ↵Mike Yu
am: 29bcefcde7 -s ours am skip reason: Merged-In Iecfb7054123ffa8fe88d2e0c11ee4ff4407fbcda with SHA-1 f57cb85c46 is already in history Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2299706 Change-Id: I62807cb5609e6a4f7b5731049e3d8513b6b39ca7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08Upgrade quiche to 0.14.0 am: 21aebcb8b9 am: 747fd9a206Mike Yu
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/2299706 Change-Id: I2edc029a84c02d302b271a252c46892bf45d0600 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>