Alan Stokes
17b1001282
Tweak NetworkWatchListTests.
...
Add logging to try to help diagnose flakiness.
And while I'm here, simplify & improve file closing logic.
Bug: 168216494
Test: atest CtsNetTestCases:android.net.cts.NetworkWatchlistTest
Change-Id: I1c875102f0cce32cbbe2e3b36de913741c9abb92
2020-11-06 16:57:53 +00:00
Baligh Uddin
0ed618e50a
[automerger skipped] Adjust visibility for tests am: ebff93159e -s ours am: 79f9e2ab50 -s ours am: 7df146e3d5 -s ours am: 756d891be2 -s ours
...
am skip reason: Change-Id Ic89c084604788b4d41cf854e5015c8ce7791c64d with SHA-1 6554b75697 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1486364
Change-Id: I80ade8fcad930224ccf21429d4110f2d6dbb8038
2020-11-06 04:38:44 +00:00
Baligh Uddin
4a6aabe68c
[automerger skipped] Merge history of CTS am: 43e624246b -s ours am: a4a3eafb27 -s ours am: cea311393b -s ours am: 5a3872b5e6 -s ours
...
am skip reason: Change-Id Ic89c084604788b4d41cf854e5015c8ce7791c64d with SHA-1 6554b75697 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1480699
Change-Id: I3b744e3370f23be0f1aa280de198f7c392087fe6
2020-11-06 04:38:43 +00:00
Baligh Uddin
344ad9d16a
Revert "Add OWNERS block to prevent the tree from mooving during migration." am: 1711a1222c am: 5fc493d243 am: 412fcbd7d0 am: b760dfc1bb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1482768
Change-Id: I006fb81913c25bd93e22c32f27cb931260f9e4b8
2020-11-06 04:38:11 +00:00
Baligh Uddin
756d891be2
[automerger skipped] Adjust visibility for tests am: ebff93159e -s ours am: 79f9e2ab50 -s ours am: 7df146e3d5 -s ours
...
am skip reason: Change-Id Ic89c084604788b4d41cf854e5015c8ce7791c64d with SHA-1 6554b75697 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1486364
Change-Id: Ida415fd3e988f2763fe92cfc2ada35e0ba2f624a
2020-11-06 04:20:57 +00:00
Baligh Uddin
5a3872b5e6
[automerger skipped] Merge history of CTS am: 43e624246b -s ours am: a4a3eafb27 -s ours am: cea311393b -s ours
...
am skip reason: Change-Id Ic89c084604788b4d41cf854e5015c8ce7791c64d with SHA-1 6554b75697 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1480699
Change-Id: I06a312ab9a1794004fc2067b8d72cea215381434
2020-11-06 04:20:56 +00:00
Baligh Uddin
b760dfc1bb
Revert "Add OWNERS block to prevent the tree from mooving during migration." am: 1711a1222c am: 5fc493d243 am: 412fcbd7d0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1482768
Change-Id: I15ae79db81b9a5ea8a09c9f0238f954d9cd92559
2020-11-06 04:20:50 +00:00
Baligh Uddin
7df146e3d5
[automerger skipped] Adjust visibility for tests am: ebff93159e -s ours am: 79f9e2ab50 -s ours
...
am skip reason: Change-Id Ic89c084604788b4d41cf854e5015c8ce7791c64d with SHA-1 6554b75697 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1486364
Change-Id: I976b5a41b9717e27453ea2831e8adb50d80d4d4c
2020-11-06 04:06:14 +00:00
Baligh Uddin
cea311393b
[automerger skipped] Merge history of CTS am: 43e624246b -s ours am: a4a3eafb27 -s ours
...
am skip reason: Change-Id Ic89c084604788b4d41cf854e5015c8ce7791c64d with SHA-1 6554b75697 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1480699
Change-Id: Ib80297107effa4eb3564e524cdbc9645e0b3890e
2020-11-06 04:06:13 +00:00
Baligh Uddin
412fcbd7d0
Revert "Add OWNERS block to prevent the tree from mooving during migration." am: 1711a1222c am: 5fc493d243
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1482768
Change-Id: Id4d7cc14636b7f06bc9da1e2e835bb0bcac27d32
2020-11-06 04:06:00 +00:00
Baligh Uddin
79f9e2ab50
[automerger skipped] Adjust visibility for tests am: ebff93159e -s ours
...
am skip reason: Change-Id Ic89c084604788b4d41cf854e5015c8ce7791c64d with SHA-1 1711a1222c is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1486364
Change-Id: I2cd524e25ffb24575daa91ac3b33335929f3549d
2020-11-06 03:47:59 +00:00
Baligh Uddin
a4a3eafb27
[automerger skipped] Merge history of CTS am: 43e624246b -s ours
...
am skip reason: Change-Id Ic89c084604788b4d41cf854e5015c8ce7791c64d with SHA-1 1711a1222c is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1480699
Change-Id: If81ced42e55230b210d42238ce244e6f1620dc07
2020-11-06 03:47:57 +00:00
Baligh Uddin
5fc493d243
Revert "Add OWNERS block to prevent the tree from mooving during migration." am: 1711a1222c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1482768
Change-Id: I9269ad683f9a61633b078e9ddedb43f3e9787f1f
2020-11-06 03:47:43 +00:00
Baligh Uddin
91a53c2214
[automerger skipped] Merge "Merge history of CTS" into rvc-d1-dev-plus-aosp am: c7b4a1b29d -s ours am: 4fdbf486ae -s ours
...
am skip reason: Change-Id Ia3d5f2201ce67308df8e2689f6c99e28049a4877 with SHA-1 997838cf13 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/12984381
Change-Id: I94830a607dff22fb30c5ed1a638db0e856cae2db
2020-11-05 12:18:08 +00:00
Baligh Uddin
4fdbf486ae
[automerger skipped] Merge "Merge history of CTS" into rvc-d1-dev-plus-aosp am: c7b4a1b29d -s ours
...
am skip reason: Change-Id Ia3d5f2201ce67308df8e2689f6c99e28049a4877 with SHA-1 997838cf13 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/12984381
Change-Id: Ief8acb4010aa7c81840466e6bb5707eba9049d44
2020-11-05 11:38:25 +00:00
Baligh Uddin
c7b4a1b29d
Merge "Merge history of CTS" into rvc-d1-dev-plus-aosp
2020-11-05 11:25:39 +00:00
Chalard Jean
7f65953491
Move module utils to the module package.
...
Test: FrameworksWifiTest FrameworksNetTest
Change-Id: Ib04bebb061dc64d6d685116b596fb3179d5b959a
2020-11-05 06:39:05 +00:00
Automerger Merge Worker
b4f6fa1dee
Merge "Revert "Add OWNERS block to prevent the tree from mooving during migration." am: 6554b75697 am: 7cb46422b1 am: b94226a63c"
2020-11-05 05:04:19 +00:00
Baligh Uddin
2cceb27a4c
Revert "Add OWNERS block to prevent the tree from mooving during migration." am: 6554b75697 am: 7cb46422b1 am: b94226a63c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/12991879
Change-Id: I77f4b9f2b6f71b3be982639369bf292d614e1e1f
2020-11-05 05:04:14 +00:00
TreeHugger Robot
000b518fd8
[automerger skipped] Merge "Fix visibility rule for tethering." into mainline-prod am: 48a4360c11 -s ours
...
am skip reason: Change-Id I64ae039794c33ac907adace6941b2986f3def8af with SHA-1 9b5abdd194 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/12988584
Change-Id: I5c888d668be86bc522615f795e17583ea5d53c99
2020-11-05 05:03:58 +00:00
Baligh Uddin
9561369868
[automerger skipped] Merge history of CTS am: 4cf61e4609 -s ours
...
am skip reason: Change-Id I64ae039794c33ac907adace6941b2986f3def8af with SHA-1 9b5abdd194 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/12983774
Change-Id: I2eca50246f39a29ad71b704296a4146082ec8752
2020-11-05 05:03:56 +00:00
TreeHugger Robot
48a4360c11
Merge "Fix visibility rule for tethering." into mainline-prod
2020-11-05 04:31:44 +00:00
Baligh Uddin
b94226a63c
Revert "Add OWNERS block to prevent the tree from mooving during migration." am: 6554b75697 am: 7cb46422b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/12991879
Change-Id: I5f95c3240533623982166b8e7e7f7afcb10fcec0
2020-11-05 04:25:24 +00:00
Baligh Uddin
7cb46422b1
Revert "Add OWNERS block to prevent the tree from mooving during migration." am: 6554b75697
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/12991879
Change-Id: I8bffe476b7aa462e43238d9df182280976b79712
2020-11-05 04:08:28 +00:00
Baligh Uddin
6554b75697
Revert "Add OWNERS block to prevent the tree from mooving during migration."
...
Migration of frameworks/base/packages/Tethering is complete, removing
the OWNERS block.
This reverts commit 1623eb61d5 .
BUG: 167962976
Test: TH
Change-Id: Ic89c084604788b4d41cf854e5015c8ce7791c64d
2020-11-05 03:16:29 +00:00
TreeHugger Robot
fc2efb3a79
Merge "Merge history of CTS" into rvc-qpr-dev-plus-aosp am: 59bdd0e126
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/12984382
Change-Id: I5014b33c4e83be85722091c744d8300687833ca6
2020-11-05 02:38:55 +00:00
TreeHugger Robot
59bdd0e126
Merge "Merge history of CTS" into rvc-qpr-dev-plus-aosp
2020-11-05 02:21:42 +00:00
Baligh Uddin
44cbfe92c1
Fix visibility rule for tethering.
...
BUG: 167962976
Test: TH
Merged-In: I64ae039794c33ac907adace6941b2986f3def8af
Change-Id: I8f5b76642483ada00657d8d358fbf15a446dd41f
2020-11-05 02:12:46 +00:00
Baligh Uddin
35cd54f7a0
Merge history of CTS
...
BUG: 167962976
Test: TH
Merged-In: Ia3d5f2201ce67308df8e2689f6c99e28049a4877
Change-Id: I30d52c4df571c894b7797300e8f56ddd4b2cc2dd
2020-11-05 00:32:41 +00:00
Baligh Uddin
997838cf13
Merge history of CTS
...
BUG: 167962976
Test: TH
Merged-In: I19b6b09febeb62867cd3d26246b2b3b46b9422c6
Change-Id: Ia3d5f2201ce67308df8e2689f6c99e28049a4877
2020-11-04 16:00:54 +00:00
Baligh Uddin
4cf61e4609
Merge history of CTS
...
BUG: 167962976
Test: TH
Merged-In: I64ae039794c33ac907adace6941b2986f3def8af
Change-Id: I811ff4e61cda148bb0338e72d236392781ad655b
2020-11-04 15:58:33 +00:00
TreeHugger Robot
1ad3cd3cc8
Merge "Merge history of CTS"
2020-11-04 15:56:57 +00:00
Baligh Uddin
5329d7ef43
Add visibility rules for cts migration am: 661ae3923d am: c2ca22b5a9 am: 4a74a0788b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/12984519
Change-Id: Ifeda005dab54b3f5ec2ee1466e3b5ffc26407e1a
2020-11-04 10:30:39 +00:00
Baligh Uddin
4a74a0788b
Add visibility rules for cts migration am: 661ae3923d am: c2ca22b5a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/12984519
Change-Id: I476215a420cb53fe44498ee74da527a3675aaedf
2020-11-04 10:17:37 +00:00
Baligh Uddin
c2ca22b5a9
Add visibility rules for cts migration am: 661ae3923d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/12984519
Change-Id: Ia8a1b074496bd7c5b4c127fe8dc476d54f63d414
2020-11-04 10:06:12 +00:00
Baligh Uddin
661ae3923d
Add visibility rules for cts migration
...
BUG: 167962976
Test: TH
Change-Id: I96b34517e164789c9fa3b8fd7fb33fdd7a2a9166
2020-11-04 05:59:46 +00:00
Baligh Uddin
ebff93159e
Adjust visibility for tests
...
BUG: 167962976
Test: TH
Merged-In: Ic89c084604788b4d41cf854e5015c8ce7791c64d
Change-Id: I12e326167c6fb61a59a919cdd0198ac8f8c84772
2020-11-04 05:06:58 +00:00
Baligh Uddin
9b5abdd194
Merge history of CTS
...
BUG: 167962976
Test: TH
Merged-In: Ie7f9480500a5d1b68ef2c3c15dd1492b4c9bbb00
Change-Id: I64ae039794c33ac907adace6941b2986f3def8af
2020-11-04 04:55:27 +00:00
Baligh Uddin
43e624246b
Merge history of CTS
...
BUG: 167962976
Test: TH
Merged-In: Ic89c084604788b4d41cf854e5015c8ce7791c64d
Change-Id: I475d5fc915b1525f02fa70cb0694f21c3eb7d15f
2020-11-04 04:08:37 +00:00
Treehugger Robot
384bce6857
[automerger skipped] Merge "DO NOT MERGE Revert "DO NOT MERGE CTS: Ensure CONFIGURED_NETWORKS_CHANGED_ACTION broadcast is received"" into pie-cts-dev am: 4359c30de8 -s ours am: 19aae02e9b -s ours am: a92e357a69 am: 404faef59b -s ours am: 27dfba6839 am: b9049fcc11 am: 6f3b23ea74 am: c8894b023f -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/cts/+/1485237
Change-Id: Icde1c44d3e64ca18c36aa262c2019344415ef53d
2020-11-03 23:11:18 +00:00
Automerger Merge Worker
ac3af0fd50
Merge "[automerger skipped] Merge "DO NOT MERGE Revert "DO NOT MERGE CTS: Ensure CONFIGURED_NETWORKS_CHANGED_ACTION broadcast is received"" into pie-cts-dev am: 4359c30de8 -s ours am: 19aae02e9b -s ours am: a92e357a69 am: 404faef59b -s ours am: 27dfba6839 am: b9049fcc11 am: 7ab7097cb4" into rvc-qpr-dev-plus-aosp am: 967b6f3821 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/cts/+/1485237
Change-Id: I3f708b14b44bb516664fe9c716815430717a896e
2020-11-03 23:11:07 +00:00
Automerger Merge Worker
c8b92a91f8
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE Revert "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions"" into oreo-cts-dev am: 3efc6792c3 -s ours" into oreo-mr1-cts-dev am: 59293fcb82 -s ours" into pie-cts-dev am: f12e2fe536 -s ours am: f8249a4d1a -s ours am: c808b50c3a am: 71594f8237 -s ours am: c00332ba4a am: a9d648eede am: c8e12d510f am: 491c5b8ef9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/cts/+/1485238
Change-Id: Icdf1619bc4e58bdf79894a2b952c9a65db8ed481
2020-11-03 23:10:58 +00:00
Automerger Merge Worker
3536f28bf7
Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE Revert "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions"" into oreo-cts-dev am: 3efc6792c3 -s ours" into oreo-mr1-cts-dev am: 59293fcb82 -s ours" into pie-cts-dev am: f12e2fe536 -s ours am: f8249a4d1a -s ours am: c808b50c3a am: 71594f8237 -s ours am: c00332ba4a am: a9d648eede am: 0e03509d1f" into rvc-qpr-dev-plus-aosp am: 15f9d94f16 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/cts/+/1485238
Change-Id: Iab7d36f332eeb8571c0632e288a6de625b871543
2020-11-03 23:10:46 +00:00
Automerger Merge Worker
d865334c41
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE Revert "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions"" into oreo-mr1-cts-dev am: 4542e0c819 -s ours" into pie-cts-dev am: e1b5862f78 -s ours" into pi-dev am: 6edeff29fb -s ours am: 2b1385c506 am: 536ab3769c -s ours am: 14a92a0ebe am: c56ef945b4 am: 4cea3e7e9a am: 632b314e61 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/cts/+/1485239
Change-Id: I86d8ed11fe90c8e9496208afd96da384bab12314
2020-11-03 23:10:34 +00:00
Automerger Merge Worker
26e549ef4d
Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE Revert "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions"" into oreo-mr1-cts-dev am: 4542e0c819 -s ours" into pie-cts-dev am: e1b5862f78 -s ours" into pi-dev am: 6edeff29fb -s ours am: 2b1385c506 am: 536ab3769c -s ours am: 14a92a0ebe am: c56ef945b4 am: 52f4ea078a" into rvc-qpr-dev-plus-aosp am: 4a25491b78 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/cts/+/1485239
Change-Id: Ifb2b32fdf35ee4d4ae86baf3a05947b7b79e2a4e
2020-11-03 23:10:21 +00:00
Treehugger Robot
f228abadd9
[automerger skipped] Merge "DO NOT MERGE Revert "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions"" into oreo-cts-dev am: 3efc6792c3 -s ours am: ceb010f310 am: 4613a9d724 am: 33fb3f988c -s ours am: e3e837a6db -s ours am: a05bebb04e am: 95e481a154 -s ours am: f175703310 am: c55632d520 am: 5f9eb8ae75 am: efc8100c5c -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/cts/+/1485238
Change-Id: Ica957b4ddaaf8ccba63f0aa8e2fbd1e4d2f9b790
2020-11-03 23:10:06 +00:00
Treehugger Robot
4adc724d60
[automerger skipped] Merge "DO NOT MERGE Revert "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions"" into oreo-cts-dev am: 3efc6792c3 -s ours am: ceb010f310 am: 4613a9d724 am: 33fb3f988c -s ours am: e3e837a6db -s ours am: a05bebb04e am: 95e481a154 -s ours am: f175703310 am: c55632d520 am: 2f60cd52cb am: 8fc4ecc77c -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/cts/+/1485238
Change-Id: Icd5665c36d1e288f6e42c99a8664e17a6dc750e6
2020-11-03 23:09:27 +00:00
Automerger Merge Worker
3695bce88a
Merge "[automerger skipped] Merge "DO NOT MERGE Revert "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions"" into oreo-cts-dev am: 3efc6792c3 -s ours" into oreo-mr1-cts-dev am: 59293fcb82 -s ours am: 85e9034712 -s ours am: c1e89c1141 -s ours am: c7834d7fbb am: 7165e18082 -s ours am: f77372429c am: 77b16b17a1 am: ecfe109c20 am: 884413d9d0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/cts/+/1485238
Change-Id: I5ee074145e8cfdb0539cd7d5f38258f729cf64d1
2020-11-03 23:08:19 +00:00
Automerger Merge Worker
3cfc997d35
Merge "[automerger skipped] Merge "DO NOT MERGE Revert "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions"" into oreo-cts-dev am: 3efc6792c3 -s ours" into oreo-mr1-cts-dev am: 59293fcb82 -s ours am: 85e9034712 -s ours am: c1e89c1141 -s ours am: c7834d7fbb am: 7165e18082 -s ours am: f77372429c am: 77b16b17a1 am: f95aec356c am: e125a62589 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/cts/+/1485238
Change-Id: I0337ea6e73952dbab78d93cdf4bc04623f77666d
2020-11-03 23:08:08 +00:00
Automerger Merge Worker
a6576408cb
Merge "[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 am: 09261bd624 am: 6a6809039a" into rvc-qpr-dev-plus-aosp am: 3b79159928 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/cts/+/1485239
Change-Id: I28553c7593185782157b687ea47f61e00096f9f7
2020-11-03 23:07:59 +00:00