Commit Graph

7357 Commits

Author SHA1 Message Date
Treehugger Robot
9039774e2b Merge "Add com.google.android.resolv.apex and com.google.android.tethering.apex for CtsNetTestCasesLatestSdk." am: 7851370b12 am: c408ae280f am: 7d70389950 am: a888654d70
Original change: https://android-review.googlesource.com/c/platform/cts/+/1471584

Change-Id: Iaf7b022badad9b186f90c4232026c4d6a5cb8675
2020-10-26 10:39:05 +00:00
Treehugger Robot
a888654d70 Merge "Add com.google.android.resolv.apex and com.google.android.tethering.apex for CtsNetTestCasesLatestSdk." am: 7851370b12 am: c408ae280f am: 7d70389950
Original change: https://android-review.googlesource.com/c/platform/cts/+/1471584

Change-Id: Ifb79bfaad1875d924b26332a0f72fc6cf9dcf93c
2020-10-26 10:12:14 +00:00
Treehugger Robot
7d70389950 Merge "Add com.google.android.resolv.apex and com.google.android.tethering.apex for CtsNetTestCasesLatestSdk." am: 7851370b12 am: c408ae280f
Original change: https://android-review.googlesource.com/c/platform/cts/+/1471584

Change-Id: Idfc85a5641ebba65197152b7abf9cc915684deef
2020-10-26 09:58:50 +00:00
Treehugger Robot
7851370b12 Merge "Add com.google.android.resolv.apex and com.google.android.tethering.apex for CtsNetTestCasesLatestSdk." 2020-10-26 08:56:35 +00:00
Yan Yan
2be532e967 [automerger skipped] Merge "Migrate IPsec CTS out of tests/tests/net" into mainline-prod am: be9d43dfaf -s ours
am skip reason: Change-Id I08f069c2a11f3daa3f0332c631055a1e0be7ce7b with SHA-1 b4d5a4b66f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12850983

Change-Id: I2e75951cde796466826ee978d23e4024e9735116
2020-10-23 19:23:09 +00:00
Yan Yan
be9d43dfaf Merge "Migrate IPsec CTS out of tests/tests/net" into mainline-prod 2020-10-23 19:06:41 +00:00
easoncylee
48c4cf621d Add com.google.android.resolv.apex and com.google.android.tethering.apex
for CtsNetTestCasesLatestSdk.

Reference: https://android-review.googlesource.com/c/platform/cts/+/1331100/3/tests/tests/net/AndroidTestTemplate.xml#23

Bug: 160877913
Test: forrest.
Change-Id: If39c594a0fdc39a8a7272464fc59e2a1483f6d54
2020-10-23 13:10:56 +08:00
Remi NGUYEN VAN
109bd7083b [automerger skipped] Merge "Wait for connect before dropping permissions" into mainline-prod am: d3091327ae -s ours
am skip reason: Change-Id I0f47c455f2c1596a887abab7d35146d8557d736a with SHA-1 0c70933916 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12900596

Change-Id: I0a8f4f15f230c516ba0740d7159ccd015171a2e2
2020-10-23 03:44:39 +00:00
Remi NGUYEN VAN
51f8eb5d11 Merge "Wait for connect before dropping permissions" am: 6af04d2b3a am: 561ac85ed3 am: e429055678 am: 37a09d2a17
Original change: https://android-review.googlesource.com/c/platform/cts/+/1470543

Change-Id: Ibbb8c384a712b6a1e71d1457f175396839edec95
2020-10-22 10:49:31 +00:00
Remi NGUYEN VAN
37a09d2a17 Merge "Wait for connect before dropping permissions" am: 6af04d2b3a am: 561ac85ed3 am: e429055678
Original change: https://android-review.googlesource.com/c/platform/cts/+/1470543

Change-Id: Ifcce4a9f364fd53227871fa41869c6ffed70f24e
2020-10-22 10:35:25 +00:00
Remi NGUYEN VAN
4728ed460f Wait for connect before dropping permissions
WifiManager#connect is implemented with a oneway binder call, so it may
return before the permission check. The previous code could drop shell
permissions before the check is performed.

Use WifiManager.ActionListener to wait for the operation to end before
dropping permissions.

Also refactor current usages of various "run as shell" utilities to use
TestPermissionUtil.runAsShell, which is the "standard" utility used in
connectivity tests (both in CTS and in other tests).

Bug: 170371191
Test: atest CtsNetTestCasesLatestSdk:CaptivePortalTest
Original-Change: https://android-review.googlesource.com/1470543
Merged-In: I0f47c455f2c1596a887abab7d35146d8557d736a
Change-Id: I0f47c455f2c1596a887abab7d35146d8557d736a
2020-10-22 10:34:32 +00:00
Remi NGUYEN VAN
e429055678 Merge "Wait for connect before dropping permissions" am: 6af04d2b3a am: 561ac85ed3
Original change: https://android-review.googlesource.com/c/platform/cts/+/1470543

Change-Id: Iaeec1eb060b01ce898591bcb7c9c280ca9b04839
2020-10-22 10:15:18 +00:00
Remi NGUYEN VAN
0c70933916 Wait for connect before dropping permissions
WifiManager#connect is implemented with a oneway binder call, so it may
return before the permission check. The previous code could drop shell
permissions before the check is performed.

Use WifiManager.ActionListener to wait for the operation to end before
dropping permissions.

Also refactor current usages of various "run as shell" utilities to use
TestPermissionUtil.runAsShell, which is the "standard" utility used in
connectivity tests (both in CTS and in other tests).

Bug: 170371191
Test: atest CtsNetTestCasesLatestSdk:CaptivePortalTest
Change-Id: I0f47c455f2c1596a887abab7d35146d8557d736a
2020-10-22 15:37:50 +09:00
TreeHugger Robot
0911c6062b [automerger skipped] Merge "Don't check broadcast intent on connection status check" into mainline-prod am: 1980f8cf3d -s ours
am skip reason: Change-Id I88f434798ec83539df9cc6a81446ca37a0081e3b with SHA-1 8ff9c262ca is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12791696

Change-Id: I2e96f746c95c8fd9dcf7fdc8cbe0b745dc8d4739
2020-10-21 09:24:28 +00:00
TreeHugger Robot
7f93da264f Merge "Fix a way for this test to flake." into mainline-prod am: 4bb9fc2479
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12845755

Change-Id: Ib60e78ce75364b9e998f2abc0fee1da40b5b97f8
2020-10-21 09:24:15 +00:00
TreeHugger Robot
1980f8cf3d Merge "Don't check broadcast intent on connection status check" into mainline-prod 2020-10-21 09:21:43 +00:00
TreeHugger Robot
4bb9fc2479 Merge "Fix a way for this test to flake." into mainline-prod 2020-10-21 09:04:49 +00:00
Treehugger Robot
52224a47c1 [automerger skipped] Merge "Merge redfin/bramble support." am: 1324688f1a -s ours am: 34ee9020eb -s ours am: 10720ce356 -s ours am: e56b5a9dee -s ours
am skip reason: Change-Id I77cffc12306fafa5fdd79a426937f5ba232394a3 with SHA-1 eb3d6ab2ac is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1465807

Change-Id: Ic324d2622f1007f6bea327e27a1be3c005a2841d
2020-10-20 21:08:05 +00:00
Treehugger Robot
e56b5a9dee [automerger skipped] Merge "Merge redfin/bramble support." am: 1324688f1a -s ours am: 34ee9020eb -s ours am: 10720ce356 -s ours
am skip reason: Change-Id I77cffc12306fafa5fdd79a426937f5ba232394a3 with SHA-1 eb3d6ab2ac is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1465807

Change-Id: I6c191dcac5b2cd13b3af5e3e2efc2d48108b7069
2020-10-20 20:18:24 +00:00
Treehugger Robot
10720ce356 [automerger skipped] Merge "Merge redfin/bramble support." am: 1324688f1a -s ours am: 34ee9020eb -s ours
am skip reason: Change-Id I77cffc12306fafa5fdd79a426937f5ba232394a3 with SHA-1 eb3d6ab2ac is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1465807

Change-Id: Ib5649ccc9acb8f27a2b6eb1cc427c3894d07663c
2020-10-20 19:34:05 +00:00
Xin Li
1b758aa811 Merge redfin/bramble support.
Bug: 171218636
Merged-In: I77cffc12306fafa5fdd79a426937f5ba232394a3
Change-Id: Ibd68bd742b6888c45994951a24cb133243ff3ac0
2020-10-19 10:08:12 -07:00
Lorenzo Colitti
e516c7f49d [automerger skipped] Merge "Migrate Tethering util functions to CtsTetheringUtils" into mainline-prod am: 8a95dabff4 -s ours
am skip reason: Change-Id I59d529cb50b4b6cdafc6be78ad61a55ee1be0404 with SHA-1 2888ab7bc7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12862738

Change-Id: I73d4e5bc72c01566fc515b0e1876a401ba16262d
2020-10-17 06:46:02 +00:00
Mark Chien
bb36657e1f Migrate Tethering util functions to CtsTetheringUtils
Bug: 166057846
Bug: 170265597
Test: atest MtsTetheringTest
      atest CtsTetheringTest

Exempt-From-Owner-Approval:
   - this is clean CP from aosp/1460711 which is already approve by owner.
   - owner(Lorenzo) is on the vacation and we need this CL for FRC respin(b/171013290)

Original change: https://android-review.googlesource.com/c/platform/cts/+/1460711

Change-Id: I0f2b116b39eab6fc9f9b201709a7e4146a5c0c5f
Merged-In: I59d529cb50b4b6cdafc6be78ad61a55ee1be0404
(cherry picked from commit b220c5b694ddac3c64f9ba88290a35363413919b)
2020-10-17 03:18:38 +00:00
Mark Chien
a9976b5c21 Merge "Migrate Tethering util functions to CtsTetheringUtils" am: cea075213c am: 6bff7607d6 am: 9d04b14a87 am: 15c96bbb1e
Original change: https://android-review.googlesource.com/c/platform/cts/+/1460711

Change-Id: I569fb781794a9474d266d572cea65e109eeb76a9
2020-10-17 02:55:42 +00:00
Mark Chien
15c96bbb1e Merge "Migrate Tethering util functions to CtsTetheringUtils" am: cea075213c am: 6bff7607d6 am: 9d04b14a87
Original change: https://android-review.googlesource.com/c/platform/cts/+/1460711

Change-Id: Ie62be577cf9978f12c26d70a6f28fb34ed015348
2020-10-17 02:04:55 +00:00
Mark Chien
9d04b14a87 Merge "Migrate Tethering util functions to CtsTetheringUtils" am: cea075213c am: 6bff7607d6
Original change: https://android-review.googlesource.com/c/platform/cts/+/1460711

Change-Id: I0f2b116b39eab6fc9f9b201709a7e4146a5c0c5f
2020-10-17 01:52:50 +00:00
Mark Chien
6bff7607d6 Merge "Migrate Tethering util functions to CtsTetheringUtils" am: cea075213c
Original change: https://android-review.googlesource.com/c/platform/cts/+/1460711

Change-Id: I4f8e1e0554c5c1b6cf6cdc306920cd93d32c7d68
2020-10-17 01:37:55 +00:00
TreeHugger Robot
b8e442cf09 [automerger skipped] Merge "Do not expect broadcasts in CaptivePortalTest" into mainline-prod am: a3bb10ba80 -s ours
am skip reason: Change-Id Ie4ee6b3c3ed7c0d414fd3cc162d4183248120895 with SHA-1 48ea3b6816 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12855996

Change-Id: I5f242cb828efb44cde91c9adc25751250fc123b4
2020-10-16 18:48:52 +00:00
markchien
2888ab7bc7 Migrate Tethering util functions to CtsTetheringUtils
Bug: 166057846
Bug: 170265597
Test: atest MtsTetheringTest
      atest CtsTetheringTest
Change-Id: I59d529cb50b4b6cdafc6be78ad61a55ee1be0404
2020-10-16 17:11:20 +08:00
Treehugger Robot
72fe9c6072 Do not expect broadcasts in CaptivePortalTest
The legacy broadcast may not be sent if wifi does not become the default
network within timeout. CaptivePortalTest does not need wifi to be the
default network at the start of the test, as it will be
disconnected/reconnected immediately after anyway.

Bug: 169106352
Test: atest CtsNetTestCasesLatestSdk:CaptivePortalTest
Original-Change: https://android-review.googlesource.com/1459764
Merged-In: Ie4ee6b3c3ed7c0d414fd3cc162d4183248120895
Change-Id: Ie4ee6b3c3ed7c0d414fd3cc162d4183248120895
2020-10-16 01:36:22 +00:00
TreeHugger Robot
0fa68674fe Merge "Fix DeviceConfig resetting." 2020-10-16 00:59:12 +00:00
Automerger Merge Worker
5a786e9816 Merge "[automerger skipped] [automerger] Merge "Update the QUIC packet format." into marshmallow-cts-dev am: 5d6232f1a7 am: 6fabcd4626 am: 628e610b4f am: ecd08d9382 am: cb186b7789 am: 5ec1a84cb4 am: cb80a98c04 am: 47f5c51fb0 am: ae1e19d3fc am: 912ca85a54 am: 9894035798 -s ours am: 9a6bda3f88 -s ours am: f91c67f664 -s ours am: 529b06a44a -s ours am: 1f9eaae703 -s ours am: 2e2b04b651 -s ours am: 9b16d37316 -s ours am: 3bfd9da768 -s ours am: 0f8ddb0fbd -s ours" into rvc-qpr-dev-plus-aosp am: 360cf599f5 -s ours
am skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 a4eeed0833 is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1457990

Change-Id: Id298ad86908345ca7ad2e9564165426083414b21
2020-10-15 23:31:42 +00:00
Android Build Merger (Role)
455f0a3c60 [automerger skipped] [automerger] Merge "Update the QUIC packet format." into marshmallow-cts-dev am: 5d6232f1a7 am: 6fabcd4626 am: 628e610b4f am: ecd08d9382 am: cb186b7789 am: 5ec1a84cb4 am: cb80a98c04 am: 47f5c51fb0 am: ae1e19d3fc am: 912ca85a54 am: 9894035798 -s ours am: 9a6bda3f88 -s ours am: f91c67f664 -s ours am: 529b06a44a -s ours am: 1f9eaae703 -s ours am: 2e2b04b651 -s ours am: 9b16d37316 -s ours am: 3bfd9da768 -s ours am: 6abd501018 -s ours am: a8d9fffc0f -s ours
am skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 a4eeed0833 is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1457990

Change-Id: I37166c5ba8cf5c2666a26c02f11dd7fbae9fa5a6
2020-10-15 23:31:29 +00:00
Automerger Merge Worker
3f3c89e211 Merge "[automerger skipped] Merge "Merge "Merge "Update the QUIC packet format." into nougat-cts-dev am: f6a0cdcba6" into nougat-mr1-cts-dev am: 657d75b4bf" into oreo-cts-dev am: 56c21dd47b -s ours am: aed3c1ad12 -s ours am: b26a7dd4db -s ours am: cbb9294d76 -s ours am: 2fdc5000d3 -s ours am: 3661ac6b75 -s ours am: 2b621ef1ec -s ours am: 7b8acbae37 -s ours am: f8981e8dc2 -s ours am: 790680bcf5 -s ours" into rvc-qpr-dev-plus-aosp am: b21a5bf86b -s ours
am skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 a4eeed0833 is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1457991

Change-Id: I0a5d4932ec9fe2b2efdea6177f26c7cf7295c90b
2020-10-15 23:31:15 +00:00
Automerger Merge Worker
26464a124b [automerger skipped] Merge "Merge "Merge "Update the QUIC packet format." into nougat-cts-dev am: f6a0cdcba6" into nougat-mr1-cts-dev am: 657d75b4bf" into oreo-cts-dev am: 56c21dd47b -s ours am: aed3c1ad12 -s ours am: b26a7dd4db -s ours am: cbb9294d76 -s ours am: 2fdc5000d3 -s ours am: 3661ac6b75 -s ours am: 2b621ef1ec -s ours am: 7b8acbae37 -s ours am: f8981e8dc2 -s ours am: a93bd69572 -s ours am: 5b01d87776 -s ours
am skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 a4eeed0833 is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1457991

Change-Id: I62cdbcdefc8fa185e447ae064fd6e8a34cd72441
2020-10-15 23:31:03 +00:00
Automerger Merge Worker
aabb53dd9a Merge "[automerger skipped] Merge "Merge "Update the QUIC packet format." into nougat-cts-dev am: f6a0cdcba6" into nougat-mr1-cts-dev am: 657d75b4bf -s ours skipped: aaf2efa362 skipped: 8251b8785c skipped: fd15ea2d9a am: 313e2e1f6b -s ours am: 14d98878e9 -s ours am: bf96e75615 -s ours am: 4d43d2cbc7 -s ours am: 00b1fed126 -s ours am: bf594d3095 -s ours am: 93b289fa7c -s ours am: 12eef6f8fb -s ours am: 81aebb2031 -s ours" into rvc-qpr-dev-plus-aosp am: 2e6d4bd588 -s ours
am skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 a4eeed0833 is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1457991

Change-Id: I752acf5e023a515c491b8c658a2669df8ce1c870
2020-10-15 23:30:49 +00:00
Android Build Merger (Role)
7810190b30 [automerger skipped] Merge "Merge "Update the QUIC packet format." into nougat-cts-dev am: f6a0cdcba6" into nougat-mr1-cts-dev am: 657d75b4bf -s ours skipped: aaf2efa362 skipped: 8251b8785c skipped: fd15ea2d9a am: 313e2e1f6b -s ours am: 14d98878e9 -s ours am: bf96e75615 -s ours am: 4d43d2cbc7 -s ours am: 00b1fed126 -s ours am: bf594d3095 -s ours am: 93b289fa7c -s ours am: 12eef6f8fb -s ours am: 2289f14c46 -s ours am: 376b3b17da -s ours
am skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 a4eeed0833 is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1457991

Change-Id: Ie4b14eb45e4a93abfa0bdcb257e838a32eca9804
2020-10-15 23:30:37 +00:00
Automerger Merge Worker
a6a43ad956 Merge "[automerger skipped] [automerger] Merge "Update the QUIC packet format." into nougat-cts-dev am: f6a0cdcba6 am: 06fdc1fbef am: f46e9a77bb am: 6dc2bb4a4a am: 379881299d am: 6e1d6f8c23 am: fed295dc04 am: 61880f108e -s ours am: 6b12075ed2 -s ours am: 210575782a -s ours am: 59d1834dda -s ours am: 6f6e57bef5 -s ours am: f121cc45ce -s ours am: 7cce6f78c4 -s ours am: d7213cac6c -s ours" into rvc-qpr-dev-plus-aosp am: 6c472c963e -s ours
am skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 a4eeed0833 is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1457991

Change-Id: Ia79cc429b3c09cae9c84cb0729a470bc255af0fd
2020-10-15 23:30:26 +00:00
Android Build Merger (Role)
8abbbb8656 [automerger skipped] [automerger] Merge "Update the QUIC packet format." into nougat-cts-dev am: f6a0cdcba6 am: 06fdc1fbef am: f46e9a77bb am: 6dc2bb4a4a am: 379881299d am: 6e1d6f8c23 am: fed295dc04 am: 61880f108e -s ours am: 6b12075ed2 -s ours am: 210575782a -s ours am: 59d1834dda -s ours am: 6f6e57bef5 -s ours am: f121cc45ce -s ours am: 7cce6f78c4 -s ours am: f50ffc9924 -s ours am: e364043b24 -s ours
am skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 a4eeed0833 is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1457991

Change-Id: Ie9b61b3cde480af6d1001d1fcf750e68281b584a
2020-10-15 23:30:14 +00:00
Treehugger Robot
860d21c700 [automerger skipped] Merge "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions" into oreo-cts-dev am: f23d174804 am: e58996200c am: 1518671283 am: abf5c235e5 am: b9fa77e7ca am: 6d4a5fa3e4 am: 5474369c67 -s ours am: 6c8dbb59d8 -s ours am: a7e4b44b9d -s ours am: d0ceec443b -s ours am: d59f281274 -s ours
am skip reason: Change-Id I4669a6ff79b3d2e99795015e42bfa611cffb9070 with SHA-1 54601cdcdf is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1452057

Change-Id: Ida00f070e31e194c9e4f6be67eca3521dafd6312
2020-10-15 23:29:35 +00:00
Automerger Merge Worker
f78210494c Merge "[automerger skipped] Merge "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions" into oreo-cts-dev am: f23d174804 am: e58996200c am: 1518671283 am: abf5c235e5 am: b9fa77e7ca am: 6d4a5fa3e4 am: 5474369c67 -s ours am: 6c8dbb59d8 -s ours am: a7e4b44b9d -s ours am: 34a3de4276 -s ours" into rvc-qpr-dev-plus-aosp am: 27d21b070f -s ours
am skip reason: Change-Id I4669a6ff79b3d2e99795015e42bfa611cffb9070 with SHA-1 54601cdcdf is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1452057

Change-Id: I35527983b309f39086c476dd65b16f77e0d5dcac
2020-10-15 23:29:25 +00:00
Automerger Merge Worker
360cf599f5 Merge "[automerger skipped] [automerger] Merge "Update the QUIC packet format." into marshmallow-cts-dev am: 5d6232f1a7 am: 6fabcd4626 am: 628e610b4f am: ecd08d9382 am: cb186b7789 am: 5ec1a84cb4 am: cb80a98c04 am: 47f5c51fb0 am: ae1e19d3fc am: 912ca85a54 am: 9894035798 -s ours am: 9a6bda3f88 -s ours am: f91c67f664 -s ours am: 529b06a44a -s ours am: 1f9eaae703 -s ours am: 2e2b04b651 -s ours am: 9b16d37316 -s ours am: 3bfd9da768 -s ours am: 0f8ddb0fbd -s ours" into rvc-qpr-dev-plus-aosp 2020-10-15 23:17:08 +00:00
Android Build Merger (Role)
9ec1f5214c [automerger skipped] [automerger] Merge "Update the QUIC packet format." into marshmallow-cts-dev am: 5d6232f1a7 am: 6fabcd4626 am: 628e610b4f am: ecd08d9382 am: cb186b7789 am: 5ec1a84cb4 am: cb80a98c04 am: 47f5c51fb0 am: ae1e19d3fc am: 912ca85a54 am: 9894035798 -s ours am: 9a6bda3f88 -s ours am: f91c67f664 -s ours am: 529b06a44a -s ours am: 1f9eaae703 -s ours am: 2e2b04b651 -s ours am: 9b16d37316 -s ours am: 3bfd9da768 -s ours am: 0f8ddb0fbd -s ours
am skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 a4eeed0833 is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1457990

Change-Id: Idc0ed8e5925e79773a493f06c32959b91f7f4252
2020-10-15 23:17:02 +00:00
Android Build Merger (Role)
a8d9fffc0f [automerger skipped] [automerger] Merge "Update the QUIC packet format." into marshmallow-cts-dev am: 5d6232f1a7 am: 6fabcd4626 am: 628e610b4f am: ecd08d9382 am: cb186b7789 am: 5ec1a84cb4 am: cb80a98c04 am: 47f5c51fb0 am: ae1e19d3fc am: 912ca85a54 am: 9894035798 -s ours am: 9a6bda3f88 -s ours am: f91c67f664 -s ours am: 529b06a44a -s ours am: 1f9eaae703 -s ours am: 2e2b04b651 -s ours am: 9b16d37316 -s ours am: 3bfd9da768 -s ours am: 6abd501018 -s ours
am skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 a4eeed0833 is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1457990

Change-Id: I3bd36724ae549a79ab4a7750856ce23877918e0f
2020-10-15 23:16:59 +00:00
Automerger Merge Worker
b21a5bf86b Merge "[automerger skipped] Merge "Merge "Merge "Update the QUIC packet format." into nougat-cts-dev am: f6a0cdcba6" into nougat-mr1-cts-dev am: 657d75b4bf" into oreo-cts-dev am: 56c21dd47b -s ours am: aed3c1ad12 -s ours am: b26a7dd4db -s ours am: cbb9294d76 -s ours am: 2fdc5000d3 -s ours am: 3661ac6b75 -s ours am: 2b621ef1ec -s ours am: 7b8acbae37 -s ours am: f8981e8dc2 -s ours am: 790680bcf5 -s ours" into rvc-qpr-dev-plus-aosp 2020-10-15 23:16:55 +00:00
Automerger Merge Worker
d9e08fac39 [automerger skipped] Merge "Merge "Merge "Update the QUIC packet format." into nougat-cts-dev am: f6a0cdcba6" into nougat-mr1-cts-dev am: 657d75b4bf" into oreo-cts-dev am: 56c21dd47b -s ours am: aed3c1ad12 -s ours am: b26a7dd4db -s ours am: cbb9294d76 -s ours am: 2fdc5000d3 -s ours am: 3661ac6b75 -s ours am: 2b621ef1ec -s ours am: 7b8acbae37 -s ours am: f8981e8dc2 -s ours am: 790680bcf5 -s ours
am skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 a4eeed0833 is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1457991

Change-Id: I3e5e788bbffd75b7729e1ddcd301af0f22f9a18a
2020-10-15 23:16:50 +00:00
Automerger Merge Worker
5b01d87776 [automerger skipped] Merge "Merge "Merge "Update the QUIC packet format." into nougat-cts-dev am: f6a0cdcba6" into nougat-mr1-cts-dev am: 657d75b4bf" into oreo-cts-dev am: 56c21dd47b -s ours am: aed3c1ad12 -s ours am: b26a7dd4db -s ours am: cbb9294d76 -s ours am: 2fdc5000d3 -s ours am: 3661ac6b75 -s ours am: 2b621ef1ec -s ours am: 7b8acbae37 -s ours am: f8981e8dc2 -s ours am: a93bd69572 -s ours
am skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 a4eeed0833 is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1457991

Change-Id: I0ccb3a24be06f05103f9f0ba537fa08cef497f94
2020-10-15 23:16:46 +00:00
Automerger Merge Worker
2e6d4bd588 Merge "[automerger skipped] Merge "Merge "Update the QUIC packet format." into nougat-cts-dev am: f6a0cdcba6" into nougat-mr1-cts-dev am: 657d75b4bf -s ours skipped: aaf2efa362 skipped: 8251b8785c skipped: fd15ea2d9a am: 313e2e1f6b -s ours am: 14d98878e9 -s ours am: bf96e75615 -s ours am: 4d43d2cbc7 -s ours am: 00b1fed126 -s ours am: bf594d3095 -s ours am: 93b289fa7c -s ours am: 12eef6f8fb -s ours am: 81aebb2031 -s ours" into rvc-qpr-dev-plus-aosp 2020-10-15 23:16:43 +00:00
Android Build Merger (Role)
a0a230a49f [automerger skipped] Merge "Merge "Update the QUIC packet format." into nougat-cts-dev am: f6a0cdcba6" into nougat-mr1-cts-dev am: 657d75b4bf -s ours skipped: aaf2efa362 skipped: 8251b8785c skipped: fd15ea2d9a am: 313e2e1f6b -s ours am: 14d98878e9 -s ours am: bf96e75615 -s ours am: 4d43d2cbc7 -s ours am: 00b1fed126 -s ours am: bf594d3095 -s ours am: 93b289fa7c -s ours am: 12eef6f8fb -s ours am: 81aebb2031 -s ours
am skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 a4eeed0833 is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1457991

Change-Id: I8cc6df02ae9019a014da313fbe950b84c5ee65ac
2020-10-15 23:16:38 +00:00
Android Build Merger (Role)
376b3b17da [automerger skipped] Merge "Merge "Update the QUIC packet format." into nougat-cts-dev am: f6a0cdcba6" into nougat-mr1-cts-dev am: 657d75b4bf -s ours skipped: aaf2efa362 skipped: 8251b8785c skipped: fd15ea2d9a am: 313e2e1f6b -s ours am: 14d98878e9 -s ours am: bf96e75615 -s ours am: 4d43d2cbc7 -s ours am: 00b1fed126 -s ours am: bf594d3095 -s ours am: 93b289fa7c -s ours am: 12eef6f8fb -s ours am: 2289f14c46 -s ours
am skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 a4eeed0833 is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1457991

Change-Id: I5dff6fa6e93d83e7ec5b84723d924e22ed82b8bd
2020-10-15 23:16:35 +00:00