Commit Graph

4598 Commits

Author SHA1 Message Date
Treehugger Robot
97f575ecce [automerger skipped] Merge "DO NOT MERGE Revert "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions"" into oreo-mr1-cts-dev am: 4542e0c819 -s ours am: ebdd31d724 -s ours am: 141324a5cd -s ours am: 41406d19e8 am: b1925d6b0a -s ours am: d9e5f085fd
Original change: https://android-review.googlesource.com/c/platform/cts/+/1485239

Change-Id: I304730336a5e75f004118c2e91734c338742abc1
2020-11-03 22:14:25 +00:00
Treehugger Robot
d9e5f085fd [automerger skipped] Merge "DO NOT MERGE Revert "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions"" into oreo-mr1-cts-dev am: 4542e0c819 -s ours am: ebdd31d724 -s ours am: 141324a5cd -s ours am: 41406d19e8 am: b1925d6b0a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6b1c6f991eded41af821f25af59cc50ee976adca
2020-11-03 21:53:11 +00:00
Treehugger Robot
b1925d6b0a [automerger skipped] Merge "DO NOT MERGE Revert "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions"" into oreo-mr1-cts-dev am: 4542e0c819 -s ours am: ebdd31d724 -s ours am: 141324a5cd -s ours am: 41406d19e8
Original change: https://android-review.googlesource.com/c/platform/cts/+/1485239

Change-Id: Ifcd5d67952dba89a0b3056a865dbd566609c728a
2020-11-03 21:33:25 +00:00
Treehugger Robot
41406d19e8 [automerger skipped] Merge "DO NOT MERGE Revert "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions"" into oreo-mr1-cts-dev am: 4542e0c819 -s ours am: ebdd31d724 -s ours am: 141324a5cd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4ef01c89c30dc3e891478a2df26f04167aba793d
2020-11-03 21:26:55 +00:00
Treehugger Robot
141324a5cd [automerger skipped] Merge "DO NOT MERGE Revert "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions"" into oreo-mr1-cts-dev am: 4542e0c819 -s ours am: ebdd31d724 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If280ba235a64800cff3f300af4f9bbeb70ccfdbd
2020-11-03 20:36:13 +00:00
Treehugger Robot
ebdd31d724 [automerger skipped] Merge "DO NOT MERGE Revert "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions"" into oreo-mr1-cts-dev am: 4542e0c819 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1c75662fe6c72e514cbc78d80044982880dd619d
2020-11-03 20:08:59 +00:00
David Su
5799e9167a DO NOT MERGE Revert "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions"
This reverts commit 956f4dc231.

Reason for revert: b/171022033

Change-Id: I6f28a18ef2487fda7a205bc8bfe9d0835b553b07
2020-11-03 03:01:50 +00:00
Treehugger Robot
a9d7cf89e5 [automerger skipped] Merge "DO NOT MERGE CTS: Ensure CONFIGURED_NETWORKS_CHANGED_ACTION broadcast is received" into pie-cts-dev am: 6cb461eb65 -s ours am: 9ec68a4e77 -s ours am: d42bb3d1c3 am: 4355a4a1fa -s ours am: e230976694 -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/+/1464623

Change-Id: Ifd45d787931a7ac6bd47902cac8be9c83d8d88c1
2020-10-28 19:11:09 +00:00
Treehugger Robot
e230976694 [automerger skipped] Merge "DO NOT MERGE CTS: Ensure CONFIGURED_NETWORKS_CHANGED_ACTION broadcast is received" into pie-cts-dev am: 6cb461eb65 -s ours am: 9ec68a4e77 -s ours am: d42bb3d1c3 am: 4355a4a1fa -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id308d0ef1f72fa165c02fa461dc5cb13873dd4ba
2020-10-28 18:55:17 +00:00
Treehugger Robot
4355a4a1fa [automerger skipped] Merge "DO NOT MERGE CTS: Ensure CONFIGURED_NETWORKS_CHANGED_ACTION broadcast is received" into pie-cts-dev am: 6cb461eb65 -s ours am: 9ec68a4e77 -s ours am: d42bb3d1c3
Original change: https://android-review.googlesource.com/c/platform/cts/+/1464623

Change-Id: Ifa33a2382d4893d7efd99c254f37f05d316afd80
2020-10-28 18:42:16 +00:00
Treehugger Robot
d42bb3d1c3 [automerger skipped] Merge "DO NOT MERGE CTS: Ensure CONFIGURED_NETWORKS_CHANGED_ACTION broadcast is received" into pie-cts-dev am: 6cb461eb65 -s ours am: 9ec68a4e77 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I96d9e0e0024367af82c97303bbb7efe40dc9afdf
2020-10-28 18:11:14 +00:00
Treehugger Robot
9ec68a4e77 [automerger skipped] Merge "DO NOT MERGE CTS: Ensure CONFIGURED_NETWORKS_CHANGED_ACTION broadcast is received" into pie-cts-dev am: 6cb461eb65 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8ff4b0cdf08599f9e40c3339d196315f2e8edb4a
2020-10-28 17:39:31 +00:00
David Su
5dd45ebc2b DO NOT MERGE CTS: Ensure CONFIGURED_NETWORKS_CHANGED_ACTION broadcast is received
Android Pie CtsNetTestCases AndroidManifest.xml has both
ACCESS_WIFI_STATE & ACCESS_FINE_LOCATION permission.
Thus, it should receive the CONFIGURED_NETWORKS_CHANGED_ACTION
broadcast when a network is removed.

Bug: 159373687
Bug: 171022033
Test: atest CtsNetTestCases
Change-Id: I9d194424469d204c4f95e98b937d67ba728f2122
Merged-In: I4669a6ff79b3d2e99795015e42bfa611cffb9070
2020-10-28 17:06:54 +00:00
Remi NGUYEN VAN
d4ce63c879 Move apache HTTP tests out of tests/net
The apache HTTP library is part of the platform core APIs, which are
separate from the core networking APIs.

cts/tests/tests/net is planned to move to a separate git project to put
it closer to the associated connectivity module code.

Bug: 170371348
Test: m cts && cts-tradefed run cts -m CtsApacheHttpTestCases
Change-Id: I49972b21755235e280c75eec40db14f3db974ca1
2020-10-28 10:22:20 +09:00
Remi NGUYEN VAN
430caa9121 Drop .stubs from android.test.[base|runner|mock].stubs
The .stubs library refer to the stub library of a java_sdk_library.
Since the name of the stub library is the implementation detail of the
build system, direct use of the name should be prohibited. Actually,
clients don't need to use the stub name directly because the build
system automatically redirects <name> to <name>.stubs.

This is a partial cherry-pick for the networking tests.

Bug: 157007292
Test: m
Merged-In: I32502de3d87c5cfdbbcfe5545dd7db5e9bb551a7
(cherry picked from commit 4072d4d5d4)
Change-Id: I32502de3d87c5cfdbbcfe5545dd7db5e9bb551a7
2020-10-28 10:19:26 +09:00
Yan Yan
be9d43dfaf Merge "Migrate IPsec CTS out of tests/tests/net" into mainline-prod 2020-10-23 19:06:41 +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
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
Yan Yan
b8c683784c Migrate IPsec CTS out of tests/tests/net
Bug: 170487836
Test: atest CtsIkeTestCases
Change-Id: I08f069c2a11f3daa3f0332c631055a1e0be7ce7b
Merged-In: I08f069c2a11f3daa3f0332c631055a1e0be7ce7b
(cherry picked from commit b4d5a4b66f)
2020-10-15 15:20:25 -07: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