Orion Hodson
136538db89
Merge "Use libnetjniutils for JNI File Descriptor info" am: b5e3c63b72 am: 25bb834e23
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1519500
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I39de6d056c4ab4d2e44171069a5c2575f2b71376
2020-12-15 07:24:46 +00:00
Orion Hodson
25bb834e23
Merge "Use libnetjniutils for JNI File Descriptor info" am: b5e3c63b72
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1519500
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib025d1c3725aaf5eca31a3f954a363ebc9b7a1fb
2020-12-15 06:45:35 +00:00
Orion Hodson
b5e3c63b72
Merge "Use libnetjniutils for JNI File Descriptor info"
2020-12-15 06:25:38 +00:00
Lorenzo Colitti
2ed0825b76
Merge changes from topic "cs-generalize-underlying-networks" am: 678d27faca am: 7c822d82b7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1526361
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I70bfb5b05c834e42a4560ad82b5d816ba0dec395
2020-12-14 06:11:47 +00:00
Lorenzo Colitti
7c822d82b7
Merge changes from topic "cs-generalize-underlying-networks" am: 678d27faca
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1526361
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie5815ada76edd5d34c8cb8a184e7b1bc59fee005
2020-12-14 05:59:51 +00:00
Lorenzo Colitti
678d27faca
Merge changes from topic "cs-generalize-underlying-networks"
...
* changes:
Update NetworkAgentTest to support generalized underlying networks.
Minor fixes to NetworkAgentTest.
2020-12-14 05:19:49 +00:00
Lorenzo Colitti
ed1211d2d8
Update NetworkAgentTest to support generalized underlying networks.
...
Currently, when an agent calls setUnderlyingNetworks, the
transports of the network are hardcoded to TRANSPORT_VPN only.
This is being fixed in another CL in this topic. The new code
reports the same transports sent by the agent.
This test registers an agent with TRANSPORT_TEST|TRANSPORT_VPN.
Update the test to expect both transports in the callbacks it
receives.
Bug: 173331190
Test: passes when run with other CL in topic
Change-Id: Iede61d74fa02a4fec1f345f6d18835c1acab7337
2020-12-12 22:57:06 +09:00
Lorenzo Colitti
cc3e994f16
Minor fixes to NetworkAgentTest.
...
- Use a more realistic routing config (instead of a LinkAddress
with prefix length 0, an address with a mask of 32 and a
default route).
- Use InetAddresses to parse IP addresses since it's a public API.
- Import the NET_CAPABILITY_xxx and TRANSPORT_xxx constants for
readability.
Bug: 173331190
Test: test-only change
Change-Id: I9703d7dd5781f60fb3d531267d3f5370cbccd64f
2020-12-12 22:57:05 +09:00
Orion Hodson
e5bd0dba21
Use libnetjniutils for JNI File Descriptor info
...
Drops use of deprecated API in libnativehelper and uses a common
helper that will be stable across releases.
Bug: 158749603
Test: m
Change-Id: Ic1a1811ffb9a1c207f562a180417e99df31e3502
2020-12-11 22:48:10 +00:00
Lorenzo Colitti
bdd3d7477a
Merge "Pass in proper NetworkCapabilities in testSetUnderlyingNetworks." am: 78f7c04770 am: 06513c4cd2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1518566
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7ed38522bbfea897f238070e4e08821803142ee4
2020-12-09 02:45:38 +00:00
Lorenzo Colitti
06513c4cd2
Merge "Pass in proper NetworkCapabilities in testSetUnderlyingNetworks." am: 78f7c04770
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1518566
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie50ba58b6d067fdcaf18df5593898afef11a0aa3
2020-12-09 02:16:48 +00:00
Lorenzo Colitti
78f7c04770
Merge "Pass in proper NetworkCapabilities in testSetUnderlyingNetworks."
2020-12-09 00:11:23 +00:00
Lorenzo Colitti
977464ef5a
Pass in proper NetworkCapabilities in testSetUnderlyingNetworks.
...
The CL that introduced testSetUnderlyingNetworks allowed tests to
pass in NetworkCapabilities when registering an agent, but
incorrectly always set the agent's capabilities anyway. This
resulted in testSetUnderlyingNetworks registering an agent with
TRANSPORT_VPN and NET_CAPABILITY_NOT_VPN.
Fix this by ensuring that createNetworkAgent either uses the
passed-in capabilities unmodified, or creates its own. Assert
that the test VPN network does not have NET_CAPABILITY_NOT_VPN.
While I'm at it, remove the manual unregistration of the callback
by using the registerNetworkCallback helper method.
Also add a little bit of extra test coverage.
Bug: 173331190
Test: test-only change
Change-Id: I114d876a1b2bf5344dd7c6fa23862df1c0a412c3
2020-12-08 01:15:32 +09:00
Remi NGUYEN VAN
80c934b7fe
Set noparent in connectivity CTS owners am: d01761e07f am: 7fc54e7294
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1516266
Change-Id: I7255cf382b1748e58b4271b9bedab22b41c8deeb
2020-12-03 10:49:34 +00:00
Remi NGUYEN VAN
7fc54e7294
Set noparent in connectivity CTS owners am: d01761e07f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1516266
Change-Id: I7e6e9d5cbf2ac3d22bcfde2faeeac4ac0b61ec4f
2020-12-03 10:11:05 +00:00
Remi NGUYEN VAN
d01761e07f
Set noparent in connectivity CTS owners
...
Also reorganize the files to have one toplevel CTS owners file, and only
additional owners in subdirectories.
Change-Id: I28ce193896e1ade2034589327805870774a4d608
Test: m
2020-12-03 08:07:32 +00:00
Lorenzo Colitti
b8a7b65506
Merge "Add a CTS test for NetworkAgent#setUnderlyingNetworks." am: 7d04b2a26c am: 6bd26a9f30
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1511114
Change-Id: Idee14f317424fe991d67f5c1e7a51a63dc3ba82d
2020-11-28 04:09:07 +00:00
Lorenzo Colitti
6bd26a9f30
Merge "Add a CTS test for NetworkAgent#setUnderlyingNetworks." am: 7d04b2a26c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1511114
Change-Id: I27f049c42e03d5ce4958ab3f94346c57f858db86
2020-11-28 03:20:41 +00:00
Lorenzo Colitti
7d04b2a26c
Merge "Add a CTS test for NetworkAgent#setUnderlyingNetworks."
2020-11-28 02:49:53 +00:00
Lorenzo Colitti
57f9551d85
Merge changes I82811a97,Ic508b17e,I23ca7980 am: e74700dd5d am: 7b4b6f40a8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1512851
Change-Id: Iae2bbc364ca7d170a55259e20a159286f3394d49
2020-11-27 11:02:10 +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
Lorenzo Colitti
7b4b6f40a8
Merge changes I82811a97,Ic508b17e,I23ca7980 am: e74700dd5d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1512851
Change-Id: I480d4d7cea8d6009ef71e0bf30f6d7a18dd99783
2020-11-27 10:44:42 +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
Lorenzo Colitti
e74700dd5d
Merge changes I82811a97,Ic508b17e,I23ca7980
...
* changes:
Add OWNERS for packages/modules/Connectivity.
Add repo hooks for packages/modules/Connectivity.
Add a .gitignore in packages/modules/Connectivity.
2020-11-27 10:33:30 +00:00
Treehugger Robot
de39ae42ac
Merge "Fix race condition in NetworkWatchListTest"
2020-11-27 10:12:05 +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
Lorenzo Colitti
3657ce9cda
Add a CTS test for NetworkAgent#setUnderlyingNetworks.
...
Bug: 173331190
Test: atest CtsNetTestCases:NetworkAgentTest#testSetUnderlyingNetworks
Change-Id: I442a618d2d50eb15dbcb8926b60fc6fd0d5b2f3e
2020-11-27 18:09:24 +09:00
Lorenzo Colitti
99fcd0bbf8
Add OWNERS for packages/modules/Connectivity.
...
Specify the owners here instead of including them from other
places (e.g., frameworks/base, NetworkStack) because we hope that
this project will eventually contain all the code.
Test: none
Change-Id: I82811a9758480f16654145c4d55ef784be09de2b
2020-11-27 18:09:24 +09:00
Lorenzo Colitti
a7d3c79a76
Add repo hooks for packages/modules/Connectivity.
...
This adds the Java and Kotlin linters.
Test: repo upload
Change-Id: Ic508b17ed0b4e33c41debbbeb7a6c0406c46a973
2020-11-27 18:09:24 +09:00
Lorenzo Colitti
1fb77ae003
Add a .gitignore in packages/modules/Connectivity.
...
Test: None
Change-Id: I23ca7980db01b3f32e94876fa9a0b3952cf29914
2020-11-27 18:09:21 +09: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
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
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
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
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