Commit Graph

4580 Commits

Author SHA1 Message Date
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
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
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
Android Build Merger (Role)
f8ec7512b4 [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 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: I82204006ebbba9449f6a852a42400e6eb28bf8a5
2020-10-15 21:54:04 +00:00
Automerger Merge Worker
135815f014 [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 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: I83be5fd33bc72bbbb91a289d69a891a80796c95b
2020-10-15 21:53:52 +00:00
Android Build Merger (Role)
6d694b7ab9 [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 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: Ic2491fd8087160f21123731c2da54c9720225b53
2020-10-15 21:53:43 +00:00
Android Build Merger (Role)
b3de9035f7 [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 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: I1a9b23617ffc551251cd0be6bfd6d17770c6811e
2020-10-15 21:53:25 +00:00
Treehugger Robot
95b8e53c76 [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 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: I4d933274dfdfa1cb7925a0acc766a3b10e4d2eb4
2020-10-15 21:53:00 +00:00
Android Build Merger (Role)
9b16d37316 [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 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: Ie7d0f8b4775ed85e344a451417427ecae51f103f
2020-10-15 20:34:46 +00:00
Automerger Merge Worker
7b8acbae37 [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 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: If548ba67da81b81666c4ab43240e16542adb658a
2020-10-15 20:34:36 +00:00
Android Build Merger (Role)
93b289fa7c [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 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: Iaaa64180b08089b9c20e5acbbc7874efe65a993b
2020-10-15 20:34:26 +00:00
Android Build Merger (Role)
f121cc45ce [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 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: Ie82043ec40b1d85b586fb0002d8140a4b70ecc67
2020-10-15 20:34:16 +00:00
Treehugger Robot
6c8dbb59d8 [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 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: Id30c588b64f0e29c26d8f6c6b33bfca392745b08
2020-10-15 20:33:46 +00:00
David Su
c33ec70337 [automerger skipped] Merge "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions" into oc-dev am: dca5e4600d am: 9b4c3d90fe am: 3594a59c97 am: e5ee17fcd0 am: c899e00c12 am: 0a60140f39 -s ours am: bef6eccd45 -s ours
am skip reason: Change-Id I4669a6ff79b3d2e99795015e42bfa611cffb9070 with SHA-1 54601cdcdf is in history

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

Change-Id: I454b79ae36f4945de46593f27ffd1bb5032a294b
2020-10-15 20:10:14 +00:00
Android Build Merger (Role)
2e2b04b651 [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 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: I4b98721a3284cb44ab44880e47d460bbc7d93ea8
2020-10-15 20:09:15 +00:00
Automerger Merge Worker
2b621ef1ec [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 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: Ic55da185ad86c39e34f5962ba8fe69b7696ae040
2020-10-15 20:09:03 +00:00
Android Build Merger (Role)
bf594d3095 [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 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: I5cda56d96763b17d1d9a21112dc70b8064a2c550
2020-10-15 20:08:53 +00:00
Android Build Merger (Role)
6f6e57bef5 [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 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: Ida09b663af80d8b4a2746cb84900d7db9eb13ece
2020-10-15 20:08:46 +00:00
Treehugger Robot
5474369c67 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
Original change: https://android-review.googlesource.com/c/platform/cts/+/1452057

Change-Id: I03fa6d35a9ace74284bd98dcebea38e8ac40cb6d
2020-10-15 20:08:11 +00:00
Android Build Merger (Role)
1f9eaae703 [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 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: Ie6fc66456383d8477c751fb97fcc85340fb22668
2020-10-15 19:43:36 +00:00
Automerger Merge Worker
3661ac6b75 [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 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: If87e478889d081c4c22cb5ad639ad51253ca4b83
2020-10-15 19:43:22 +00:00
Android Build Merger (Role)
00b1fed126 [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 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: I75d754f7f37e63b1977747b93419d32d5efd0091
2020-10-15 19:43:08 +00:00
Android Build Merger (Role)
59d1834dda [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 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: Ib6377ec7bb2c4cfe5461bf73866e5a385061c6f3
2020-10-15 19:42:55 +00:00
Treehugger Robot
6d4a5fa3e4 Merge "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions" into oreo-cts-dev am: f23d174804 am: e58996200c am: 1518671283 am: abf5c235e5 am: b9fa77e7ca
Original change: https://android-review.googlesource.com/c/platform/cts/+/1452057

Change-Id: I7b61d0a5221087c101675538d0e8852d7d23fb85
2020-10-15 19:42:18 +00:00
David Su
bef6eccd45 [automerger skipped] Merge "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions" into oc-dev am: dca5e4600d am: 9b4c3d90fe am: 3594a59c97 am: e5ee17fcd0 am: c899e00c12 am: 0a60140f39 -s ours
am skip reason: Change-Id I4669a6ff79b3d2e99795015e42bfa611cffb9070 with SHA-1 54601cdcdf is in history

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

Change-Id: I20318a71d0f910286ce5225d19cc8c8de51e681d
2020-10-15 19:41:46 +00:00
Android Build Merger (Role)
529b06a44a [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 skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 25da49b7ff is in history

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

Change-Id: Ia3bfef94dae85bfc34d5909fc8e39040e0c45a33
2020-10-15 19:30:09 +00:00
Automerger Merge Worker
2fdc5000d3 [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 skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 25da49b7ff is in history

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

Change-Id: Iddb392b6f2251822082aeb701916c874671c7a68
2020-10-15 19:29:56 +00:00
Android Build Merger (Role)
4d43d2cbc7 [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 skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 25da49b7ff is in history

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

Change-Id: I5ff47e56dd46bba83813ee584ae0cfba5a8fdd11
2020-10-15 19:29:41 +00:00
Android Build Merger (Role)
210575782a [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 skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 25da49b7ff is in history

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

Change-Id: I552e0c337c9acd99492707ae11bed0410448a690
2020-10-15 19:29:22 +00:00
David Su
0a60140f39 Merge "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions" into oc-dev am: dca5e4600d am: 9b4c3d90fe am: 3594a59c97 am: e5ee17fcd0 am: c899e00c12
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12773445

Change-Id: Iba15d68fe9f3b78135eff76b9f6ed3ad217dd75a
2020-10-15 19:28:52 +00:00
Treehugger Robot
b9fa77e7ca Merge "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions" into oreo-cts-dev am: f23d174804 am: e58996200c am: 1518671283 am: abf5c235e5
Original change: https://android-review.googlesource.com/c/platform/cts/+/1452057

Change-Id: Ia569939a52661cd9c4d2db7977f5dcd7411d794d
2020-10-15 19:28:49 +00:00
Android Build Merger (Role)
f91c67f664 [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 skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 25da49b7ff is in history

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

Change-Id: I7bd303ac85293a49f82234de92d3222e5b71ba3d
2020-10-15 19:15:53 +00:00
Automerger Merge Worker
cbb9294d76 [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 skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 25da49b7ff is in history

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

Change-Id: I089304af5e939312181658b598ef4e81f3f72783
2020-10-15 19:15:43 +00:00
Android Build Merger (Role)
bf96e75615 [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 skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 25da49b7ff is in history

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

Change-Id: I5973ba65a4b80c005e5832ca7083188f7d9db54d
2020-10-15 19:15:32 +00:00
Android Build Merger (Role)
6b12075ed2 [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 skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 25da49b7ff is in history

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

Change-Id: I2aefaaa40ce9bf2d7e2333c97dda2945bedcf4e1
2020-10-15 19:15:22 +00:00
Treehugger Robot
abf5c235e5 Merge "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions" into oreo-cts-dev am: f23d174804 am: e58996200c am: 1518671283
Original change: https://android-review.googlesource.com/c/platform/cts/+/1452057

Change-Id: I37d4191fd7a85a541bf57b3d277c81b5f74d5d2c
2020-10-15 19:15:00 +00:00
David Su
c899e00c12 Merge "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions" into oc-dev am: dca5e4600d am: 9b4c3d90fe am: 3594a59c97 am: e5ee17fcd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12773445

Change-Id: I7368b4a84f2d15905ce4f21bb608aba80a1b3487
2020-10-15 19:07:20 +00:00
David Su
e5ee17fcd0 Merge "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions" into oc-dev am: dca5e4600d am: 9b4c3d90fe am: 3594a59c97
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12773445

Change-Id: I305ad161f8ece6fc924e5177a948914ebcf56aee
2020-10-15 18:32:32 +00:00
David Su
3594a59c97 Merge "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions" into oc-dev am: dca5e4600d am: 9b4c3d90fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12773445

Change-Id: Ie76d31031b9c1084a4b09d7c007d5da1d6edbc6f
2020-10-15 18:21:10 +00:00
Android Build Merger (Role)
9a6bda3f88 [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 skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 25da49b7ff is in history

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

Change-Id: Ib9cb5a2e63335134ea144c515e9a4c5d95bac02c
2020-10-15 18:13:22 +00:00
Automerger Merge Worker
b26a7dd4db [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 skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 25da49b7ff is in history

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

Change-Id: I94abf4afc0b66819706551756119ecc4931cf2ef
2020-10-15 18:13:14 +00:00
Android Build Merger (Role)
14d98878e9 [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 skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 25da49b7ff is in history

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

Change-Id: I4e00c03ffc846c974dd3424a8f069ac76ef93e09
2020-10-15 18:13:05 +00:00
Android Build Merger (Role)
61880f108e [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
Original change: https://android-review.googlesource.com/c/platform/cts/+/1457991

Change-Id: I66b60fcbc34d87cb32055082f95fe86a887cac0c
2020-10-15 18:12:56 +00:00
Treehugger Robot
1518671283 Merge "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions" into oreo-cts-dev am: f23d174804 am: e58996200c
Original change: https://android-review.googlesource.com/c/platform/cts/+/1452057

Change-Id: I3bdbb98fcbad5de3083142ec69444cd6c1a744c0
2020-10-15 18:12:26 +00:00
David Su
9b4c3d90fe Merge "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions" into oc-dev am: dca5e4600d
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12773445

Change-Id: I5e3ab3f0ae09176cd0b28d596634df0ae9469ba5
2020-10-15 18:10:20 +00:00
Chalard Jean
52723ecd91 Fix a way for this test to flake.
While tests are hopefully cleaning up after themselves,
there is no guarantee that there is a currently available
default network milliseconds after any given test. Some
tests need to disconnect to check something, or to change
a property of the wifi network that they have to revert at
the end for example. Or, a test may fail leaving the device
without a default network.

To make sure the state is correctly cleaned up, have
tearDown make sure the device is connected to a working
Internet connection before the test ends, so that the next
test can be sure to find established connectivity
immediately. It's possible the device needs a few hundred
milliseconds to re-establish connectivity, so this patch
gives a grace of up to 30 seconds (the default waiting
timer for TestCallback) for connectivity to be restored at
the end of any test.

Bug: 161767594 and others
Test: ConnectivityManagerTest

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

Change-Id: I2318a6d1a6d6ac4b142fc998f0c5efbe93b68707
(cherry picked from commit ff47147c3a)
2020-10-15 08:00:12 +00:00
Automerger Merge Worker
73dae6c844 [automerger skipped] Merge "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" into oreo-mr1-cts-dev am: 087370b5e1 am: 8a55801f3c -s ours am: 034867ffb1 -s ours am: df92bb75d1 -s ours am: 8a4a02b67d -s ours am: 653c3ae908 -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: If4b06a913b50e8894c25af9a8265880ef07afa45
2020-10-14 13:51:36 +00:00
Automerger Merge Worker
3fe30cf8b5 [automerger skipped] Merge "Merge "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" into oreo-mr1-cts-dev am: 087370b5e1" into pie-cts-dev am: 9b59163ff4 am: f9d89e72aa -s ours am: 9dd6826835 -s ours am: 8fc810613a -s ours am: 8aba01a25b -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: I58e8a259dcfc7a8a6313c7ea505ffd5636873143
2020-10-14 13:51:26 +00:00
Treehugger Robot
5cbe036f07 [automerger skipped] Update the QUIC packet format. am: a4eeed0833 am: 068469e100 -s ours am: dc6d9389f7 -s ours
am skip reason: Change-Id I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf with SHA-1 8b5d18fe90 is in history

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

Change-Id: I3e0d64bc672ca7fa75fd80230be6b0b71bfd6b28
2020-10-14 13:51:16 +00:00