Commit Graph

6741 Commits

Author SHA1 Message Date
Treehugger Robot
6fb05287da [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: d59688258b -s ours am: 579d87b15b -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: I409a3abe705704fd24c83d5eee0b984afbc5c740
2020-10-28 23:04:08 +00:00
Treehugger Robot
579d87b15b [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: d59688258b -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: I685f309457d6f62c8f5e3b2901a7826e757fce13
2020-10-28 21:06:55 +00:00
Treehugger Robot
d59688258b [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: I06b09ea9a14b65c105c3a91fa3d695e1761611f8
2020-10-28 19:10:55 +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
Treehugger Robot
9cf83254fb Merge "Add all CTS tests to general-tests suite" am: 28b5564126 am: b6a955df5b am: fb7a1f49d2
Original change: https://android-review.googlesource.com/c/platform/cts/+/1477639

Change-Id: Ifd22f79bf52b43cf7f5921f45a11ac5f8c930cc8
2020-10-27 23:53:03 +00:00
Treehugger Robot
fb7a1f49d2 Merge "Add all CTS tests to general-tests suite" am: 28b5564126 am: b6a955df5b
Original change: https://android-review.googlesource.com/c/platform/cts/+/1477639

Change-Id: I05f63c992cd7bce4e891a44d593fd8330049857c
2020-10-27 23:21:56 +00:00
Dan Shi
98716c5cdc Add all CTS tests to general-tests suite
Exempt-From-Owner-Approval: this change only adds the tests to
general-tests.zip, doesn't change any test behavior.

Bug: 171481522
Test: none
Change-Id: I1711237f00572d57f611dcd16ec9ad345a0b5b3b
2020-10-27 22:25:33 +00:00
Remi NGUYEN VAN
aed3600f7d Merge "Move apache HTTP tests out of tests/net" am: 1cdfeec47d am: bc83be307e am: 9f65c013a3
Original change: https://android-review.googlesource.com/c/platform/cts/+/1471587

Change-Id: I0feefa1e57ce121001e61ac14963bf5ecd985e15
2020-10-27 08:09:16 +00:00
Remi NGUYEN VAN
9f65c013a3 Merge "Move apache HTTP tests out of tests/net" am: 1cdfeec47d am: bc83be307e
Original change: https://android-review.googlesource.com/c/platform/cts/+/1471587

Change-Id: I9cef4699702f109f7edab8c781e137db3d532069
2020-10-27 07:45:36 +00:00
Remi NGUYEN VAN
1cdfeec47d Merge "Move apache HTTP tests out of tests/net" 2020-10-27 06:39:25 +00:00
Remi NGUYEN VAN
438200afb9 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-27 11:07:04 +09: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
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
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
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
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
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
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
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
Automerger Merge Worker
6c472c963e 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 2020-10-15 23:16:31 +00:00
Android Build Merger (Role)
abeca9bdba [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
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: I75bd94cf03899691d5a295ca2b0e1be22196bdfc
2020-10-15 23:16:25 +00:00
Android Build Merger (Role)
e364043b24 [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 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: I3e153b77e58de05d9ddb0860c9428fe1694e7a28
2020-10-15 23:16:22 +00:00
Treehugger Robot
d59f281274 [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 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: If2408c75aa0bbb8a9b11da03f2667b9932e59650
2020-10-15 23:15:38 +00:00
Treehugger Robot
24168a08c9 [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
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: I48d326f503be090367a6b973dfdd9ab2b4361420
2020-10-15 23:15:27 +00:00
Android Build Merger (Role)
6abd501018 [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 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: Icf4bfcbff607db74bdcd8e33ad589da4690b70db
2020-10-15 23:00:32 +00:00
Automerger Merge Worker
a93bd69572 [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 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: I1a13876893ae62abdde7270ac02ba0d2f9db9055
2020-10-15 23:00:21 +00:00
Android Build Merger (Role)
2289f14c46 [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 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: I1f9ae41647d35090db149a8192e32b4e9752014d
2020-10-15 23:00:10 +00:00
Android Build Merger (Role)
f50ffc9924 [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 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: I9dcc5dfab21d9fdfd26c7f646749aff34b61abee
2020-10-15 22:59:59 +00:00
Treehugger Robot
d0ceec443b [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 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: Ib4b3259d20ffa3c540946575ff6c720030116e7d
2020-10-15 22:59:32 +00:00
David Su
21aa95088d [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: 4a9caf9a80 -s ours am: 881b3e9f40 -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: Ia6e807c3f6719b4da79a9d67465ca8f53b991f25
2020-10-15 21:53:34 +00:00
David Su
6e64780d1c [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: 4a9caf9a80 -s ours am: 168c65f9fc -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: I7a28ea4f889b164d3fc779f775cbaed024f48805
2020-10-15 21:52:59 +00:00