Commit Graph

10863 Commits

Author SHA1 Message Date
Treehugger Robot
d9f603eebf Merge "Fix race condition in NetworkWatchListTest" am: de39ae42ac am: 59ecc20061 am: 14991f2507
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1511070

Change-Id: I0f6639d68c486ff556ee28b65476cfab2cf61fd6
2020-11-27 11:40:56 +00:00
Treehugger Robot
14991f2507 Merge "Fix race condition in NetworkWatchListTest" am: de39ae42ac am: 59ecc20061
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1511070

Change-Id: Ifcbd7a3845695688d56042b6f284c634d135b679
2020-11-27 11:02:03 +00:00
Treehugger Robot
59ecc20061 Merge "Fix race condition in NetworkWatchListTest" am: de39ae42ac
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1511070

Change-Id: I14fa977efaf51d591409a8a4c2c547bba7d8bed1
2020-11-27 10:44:33 +00:00
Treehugger Robot
de39ae42ac Merge "Fix race condition in NetworkWatchListTest" 2020-11-27 10:12:05 +00:00
Remi NGUYEN VAN
8b94253963 Merge "Add TEST_MAPPING config for CTS postsubmit" am: d4430d28ba am: 9d29736aea am: 1b305b9cac
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1509694

Change-Id: I49f70affe37bee2091cd7222afc469c43e3fee95
2020-11-27 10:02:29 +00:00
Remi NGUYEN VAN
1b305b9cac Merge "Add TEST_MAPPING config for CTS postsubmit" am: d4430d28ba am: 9d29736aea
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1509694

Change-Id: I4717ac8283b7819e4a47d66b8b83ff77bf712f26
2020-11-27 09:23:24 +00:00
Remi NGUYEN VAN
9d29736aea Merge "Add TEST_MAPPING config for CTS postsubmit" am: d4430d28ba
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1509694

Change-Id: Id6c5b6d1150a0c30a55cbaafc7cdbcad56263bb3
2020-11-27 08:56:54 +00:00
Remi NGUYEN VAN
d4430d28ba Merge "Add TEST_MAPPING config for CTS postsubmit" 2020-11-27 08:42:31 +00:00
Alan Stokes
36529b250a Fix race condition in NetworkWatchListTest
We were running cp to create a file and then running a command to read
the file. However were weren't waiting for the cp to finish (or,
indeed, start), so occasionally the read would fail saying the file
didn't exist.

Also added some logging, because diagnosing failure without it is
painful. Also simplify & improve file closing logic.

Some of this was previously submitted on internal master as change
I1c875102f0cce32cbbe2e3b36de913741c9abb92, but I've reverted that in
favor of this.

Bug: 168216494
Test: atest CtsNetTestCases:android.net.cts.NetworkWatchlistTest
Change-Id: I46a9db8b7a1885a9829f00bbd3233b863cfd1f5d
2020-11-26 14:27:39 +00:00
TreeHugger Robot
214ba4350c Merge "Revert "Tweak NetworkWatchListTests."" 2020-11-26 13:34:38 +00:00
Alan Stokes
29e0258707 Revert "Tweak NetworkWatchListTests."
This reverts commit 17b1001282.

Reason for revert: I'll resubmit in AOSP, with the fix for the test included.

Change-Id: I5bd63a5341a9b67ce63ec34080de13ed9203eba6
2020-11-26 12:30:05 +00:00
Treehugger Robot
6a9fca1fab Merge "Tune up TIMEOUTs of IPSec CTS for low end devices" am: 1de9621925 am: 8f501fea9c am: 0922cab8d6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1498276

Change-Id: I47aba7368f00194121235957efbb4b1810b21c3f
2020-11-25 21:15:03 +00:00
Treehugger Robot
0922cab8d6 Merge "Tune up TIMEOUTs of IPSec CTS for low end devices" am: 1de9621925 am: 8f501fea9c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1498276

Change-Id: Ic59e6cbb0bdf11f1dc9cd62fe163ed3b0f28f485
2020-11-25 20:45:29 +00:00
Treehugger Robot
8f501fea9c Merge "Tune up TIMEOUTs of IPSec CTS for low end devices" am: 1de9621925
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1498276

Change-Id: I0c22f28721ee625c86912459a14860b6d6a859ea
2020-11-25 20:23:12 +00:00
Treehugger Robot
1de9621925 Merge "Tune up TIMEOUTs of IPSec CTS for low end devices" 2020-11-25 19:56:50 +00:00
Remi NGUYEN VAN
1bc6287249 Add TEST_MAPPING config for CTS postsubmit
The new configuration runs tests on physical devices with SIM cards.
This is only done in postsubmit, as such tests can only run a few (~2) times a day due to
availability of the devices.

This configuration allows running all tests, so there is no annotation filter.

Change-Id: If95e4deeed8098327023f99e6e610331b8e86a0f
Test: TH validates TEST_MAPPING configurations
2020-11-25 18:27:48 +08:00
Junyu Lai
341e40ff92 Merge changes from topic "TrafficStats.getTxRxBytes" am: 42fbb57b31 am: 3e5a3ed5d5 am: 7bd157737e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490181

Change-Id: I2ed2b34cc43b7822e82aaa8482d1c6dfdbe9c4e3
2020-11-25 06:32:26 +00:00
junyulai
7fbfe6b4b6 Add CTS for getTx/RxBytes in TrafficStats am: 549cc56731 am: 34fe3e48e4 am: 2551dc97bc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490180

Change-Id: Iea8de06176cffcb0d32dcd63ceb070d887d3706b
2020-11-25 06:32:25 +00:00
Junyu Lai
7bd157737e Merge changes from topic "TrafficStats.getTxRxBytes" am: 42fbb57b31 am: 3e5a3ed5d5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490181

Change-Id: I4489721fe75ccc8e89d954f911bbe9ffb27e590c
2020-11-25 06:11:55 +00:00
junyulai
2551dc97bc Add CTS for getTx/RxBytes in TrafficStats am: 549cc56731 am: 34fe3e48e4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490180

Change-Id: Ic15af693266049bdeb2199cb4d206f32342f115e
2020-11-25 06:11:53 +00:00
Junyu Lai
3e5a3ed5d5 Merge changes from topic "TrafficStats.getTxRxBytes" am: 42fbb57b31
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490181

Change-Id: I93a1a017b55c30ba08da434a05c1335719ffcbcd
2020-11-25 04:14:47 +00:00
junyulai
34fe3e48e4 Add CTS for getTx/RxBytes in TrafficStats am: 549cc56731
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490180

Change-Id: Id02aa1ab9038287da16594d513368935408ed8c5
2020-11-25 04:14:46 +00:00
Junyu Lai
42fbb57b31 Merge changes from topic "TrafficStats.getTxRxBytes"
* changes:
  Exclude lingering traffic from loopback iface stats check
  Add CTS for getTx/RxBytes in TrafficStats
2020-11-25 02:35:20 +00:00
Chalard Jean
1cb10ffcb7 Merge "This bug was fixed in S, don't test for it in R" am: d639d12161 am: a56ea8445c am: 57674cb4d7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1505171

Change-Id: I6d7b4a2b1b952b7d12f482ffd44676e19f28ee31
2020-11-24 10:25:17 +00:00
Chalard Jean
57674cb4d7 Merge "This bug was fixed in S, don't test for it in R" am: d639d12161 am: a56ea8445c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1505171

Change-Id: I235388b4828f7fc99c9e0776cac210dce7ba425a
2020-11-24 10:05:45 +00:00
Chalard Jean
a56ea8445c Merge "This bug was fixed in S, don't test for it in R" am: d639d12161
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1505171

Change-Id: I80515e22a2434f5deb6001d77c7cad79d9f92615
2020-11-24 09:51:51 +00:00
Chalard Jean
d639d12161 Merge "This bug was fixed in S, don't test for it in R" 2020-11-24 07:01:57 +00:00
Chalard Jean
e90c48c9aa This bug was fixed in S, don't test for it in R
Bug: 172401665
Test: CtsNetTestCasesLatestSdk
Change-Id: Ib9fb3ec09eeaebbb4ac1b1b458cfcc5c4f506cff
2020-11-20 17:54:26 +09:00
Cody Kesting
b0d9d4c91a Merge "Use READ_PHONE_STATE when checking Carrier Configs." am: b9e51da2e8 am: 38cda37e44 am: 858c8c94c8 am: b079174dcb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1489639

Change-Id: I47cbb1dfae6176bd8ede840636a06373ecdf358d
2020-11-17 19:57:05 +00:00
Cody Kesting
b079174dcb Merge "Use READ_PHONE_STATE when checking Carrier Configs." am: b9e51da2e8 am: 38cda37e44 am: 858c8c94c8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1489639

Change-Id: I3579a8295c70b2c6efad985f0cc2a570bb9e8257
2020-11-17 19:18:26 +00:00
Cody Kesting
858c8c94c8 Merge "Use READ_PHONE_STATE when checking Carrier Configs." am: b9e51da2e8 am: 38cda37e44
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1489639

Change-Id: Ib79b94583f4b72d595cf13258f6651359bb60017
2020-11-17 18:58:46 +00:00
Cody Kesting
38cda37e44 Merge "Use READ_PHONE_STATE when checking Carrier Configs." am: b9e51da2e8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1489639

Change-Id: I84dedf9b3ff80d837f7b1fcd4a608e45db6afa00
2020-11-17 18:39:43 +00:00
Cody Kesting
b9e51da2e8 Merge "Use READ_PHONE_STATE when checking Carrier Configs." 2020-11-17 17:54:09 +00:00
Luke Huang
95dbe24bdd [automerger skipped] Fix minor bug and deflaky for DnsResolverTest am: b896220cda -s ours
am skip reason: Change-Id I91190d8644ff7a7dfaf4fa3f2d43c17f67dfac11 with SHA-1 fcabfc688d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13051332

Change-Id: If4514b7c723b5ef0daf53d2a1d35698692840d49
2020-11-13 07:34:40 +00:00
Baligh Uddin
0622aff1fc [automerger skipped] Merge history of CTS am: d59fc536de -s ours
am skip reason: Change-Id I91190d8644ff7a7dfaf4fa3f2d43c17f67dfac11 with SHA-1 fcabfc688d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13051330

Change-Id: Iaf07c739fa8b2db06711599233c4e72f729731a6
2020-11-13 07:34:38 +00:00
Baligh Uddin
bb3a7eb181 [automerger skipped] Revert "Merge history of CTS" am: 2f82a83bb1 -s ours
am skip reason: Change-Id I91190d8644ff7a7dfaf4fa3f2d43c17f67dfac11 with SHA-1 fcabfc688d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13051329

Change-Id: Ia7438802f22c22ae4a38024a8876ef7f4eeaa7a6
2020-11-13 07:34:33 +00:00
Luke Huang
b896220cda Fix minor bug and deflaky for DnsResolverTest
1. Add the missing countdown() in the test callback
2. Add ensureWifiConnected() to prevent no available network problem.
3. Increase the timeout for awaiting private DNS setting because
   current one might not be enough.

Bug: 168027339
Test atest

Merged-In: I91190d8644ff7a7dfaf4fa3f2d43c17f67dfac11
Original-Change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1486780
(cherry picked from commit e2005b0138)
Change-Id: Id4ca3a0651b998ce614fe83f52df6362268dc43f
2020-11-13 03:42:57 +00:00
Yintang Gu
5c39147e5a Tune up TIMEOUTs of IPSec CTS for low end devices
Ikev2VpnTest#testStartStopVpnProfileV4 and testStartStopVpnProfileV6
contains the IKE sequences and requires the phone to send and receive
the required packet in 1000ms.
On some low end devices, the response time may exceeds this TIMEOUT
sometimes.
So we need to use larger timeouts.

Bug: 171176723
Change-Id: I005b83ffecd8ade5063000690bfd4136d82f1a07
2020-11-13 10:43:31 +08:00
Baligh Uddin
d59fc536de Merge history of CTS
BUG: 167962976
Test: TH
Merged-In: I91190d8644ff7a7dfaf4fa3f2d43c17f67dfac11
Change-Id: Iff9a8cabe6150c81f199979e802f63790e73b334
2020-11-13 01:24:50 +00:00
Baligh Uddin
2f82a83bb1 Revert "Merge history of CTS"
This reverts commit 4cf61e4609.

Reason for revert: Re-Establish with History
Merged-In: I91190d8644ff7a7dfaf4fa3f2d43c17f67dfac11
Change-Id: Iea881b738f7d80bfe6931ae4f4c808560c01f282
2020-11-13 01:23:48 +00:00
Treehugger Robot
98fd4e7b1d Merge "Add an owner for NetworkWatchlistTest." am: 4eda64baca am: 107b0a0745 am: 458c898778 am: 3cd209f671
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1492980

Change-Id: Ie4a100bd2c1a78dc3a663c140537e0fa313eea51
2020-11-12 14:53:05 +00:00
Treehugger Robot
3cd209f671 Merge "Add an owner for NetworkWatchlistTest." am: 4eda64baca am: 107b0a0745 am: 458c898778
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1492980

Change-Id: I147a1c9bcc211d2ecdc958dd9fb9f5ef927b2693
2020-11-12 13:58:18 +00:00
Treehugger Robot
458c898778 Merge "Add an owner for NetworkWatchlistTest." am: 4eda64baca am: 107b0a0745
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1492980

Change-Id: I0e0cc44b0d6cec929eeb90adf6703aa4fb5adb5e
2020-11-12 13:42:52 +00:00
Treehugger Robot
107b0a0745 Merge "Add an owner for NetworkWatchlistTest." am: 4eda64baca
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1492980

Change-Id: Icbadae3abb93626916d0d5533d515767e424a9b8
2020-11-12 13:31:55 +00:00
Treehugger Robot
4eda64baca Merge "Add an owner for NetworkWatchlistTest." 2020-11-12 13:02:46 +00:00
Treehugger Robot
55c6c776df Merge "Use ACCESS_WIFI_STATE when clearing wifi blacklist" am: f5ae03550a am: 85dfa5cae0 am: 531e6b8080 am: b39a8f6def
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490016

Change-Id: Ifa5c49beeb12bfebbe2cd35e9a2cb578389b8794
2020-11-12 07:22:36 +00:00
Treehugger Robot
91148a5d94 Merge "Use CONNECTIVITY_INTERNAL on Q for portal URL" am: 2a7cf08b8e am: 58ae094ec7 am: 1a7d76dba8 am: 288211a65b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490178

Change-Id: Ic07bea55ec41cb2ef96554b8b490b0297fb81308
2020-11-12 07:22:29 +00:00
Treehugger Robot
b39a8f6def Merge "Use ACCESS_WIFI_STATE when clearing wifi blacklist" am: f5ae03550a am: 85dfa5cae0 am: 531e6b8080
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490016

Change-Id: I40dfb1caa6169dcd6ecb33c9f582603d2037bee7
2020-11-12 06:46:25 +00:00
Treehugger Robot
288211a65b Merge "Use CONNECTIVITY_INTERNAL on Q for portal URL" am: 2a7cf08b8e am: 58ae094ec7 am: 1a7d76dba8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490178

Change-Id: I382bdf976ef5e3635cfd7244484d279ee8263b5a
2020-11-12 06:46:07 +00:00
Treehugger Robot
531e6b8080 Merge "Use ACCESS_WIFI_STATE when clearing wifi blacklist" am: f5ae03550a am: 85dfa5cae0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1490016

Change-Id: I15f60115e5260ea159f9fb43bda1079220a8d6bd
2020-11-12 06:23:39 +00:00