Commit Graph

10905 Commits

Author SHA1 Message Date
Orion Hodson
d4763bc919 Merge "Use libnetjniutils for JNI File Descriptor info" am: b5e3c63b72 am: 25bb834e23 am: 136538db89
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1519500

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied073b067a19ea20f6a2206b43d37446145371d0
2020-12-15 08:11:23 +00:00
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
d57fcbe873 Merge changes from topic "cs-generalize-underlying-networks" am: 678d27faca am: 7c822d82b7 am: 2ed0825b76
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1526361

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibaab9f8b09cecb9bea9dcbad14d54939d3829628
2020-12-14 06:40:27 +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
Chalard Jean
d4c0438b50 [automerger skipped] Move module utils to the module package. am: 2a51c1086d -s ours
am skip reason: Change-Id Ib04bebb061dc64d6d685116b596fb3179d5b959a with SHA-1 7f65953491 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I313fe6cff49b7626e416bc01c8756f6c14705e8f
2020-12-11 02:18:48 +00:00
Chalard Jean
2a51c1086d Move module utils to the module package.
Test: FrameworksWifiTest FrameworksNetTest
Merged-In: Ib04bebb061dc64d6d685116b596fb3179d5b959a
Change-Id: Ic496cd62be8c90928ccc619519ebe517beea78f0
2020-12-10 16:37:15 +09:00
Lorenzo Colitti
becc4502e2 Merge "Pass in proper NetworkCapabilities in testSetUnderlyingNetworks." am: 78f7c04770 am: 06513c4cd2 am: bdd3d7477a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1518566

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6ff7d4a93529d6dfee4271c429aa837f6ebca78
2020-12-09 03:05:38 +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
TreeHugger Robot
8e0c42d3f7 [automerger skipped] Merge changes I40c22e2f,Id189676b,I9fb3be17,I63ca1668,I208bcd3f, ... into mainline-prod am: 38b7e2b257 -s ours
am skip reason: Change-Id I3f1d7019f1a12647b78630a412df3adf03e9e95a with SHA-1 8b3c07d951 is in history

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

Change-Id: Ic7f140ea7dd0d4bbbf245fe3514d31fc0e3a3ea8
2020-12-07 05:08:26 +00:00
TreeHugger Robot
38b7e2b257 Merge changes I40c22e2f,Id189676b,I9fb3be17,I63ca1668,I208bcd3f, ... into mainline-prod
* changes:
  Add shared jarjar rule for tethering tests
  Remove unused testutils lib from tethering tests
  Fix OffloadHardwareInterfaceTest.
  tethering: offload: Netlink Req NfGen
  tethering: DAD Proxy Daemon
  Add tethering privileged test
2020-12-07 04:35:19 +00:00
markchien
4b5de730b8 Add shared jarjar rule for tethering tests
Also jarjar com.android.net.module.util* to
com.android.networkstack.tethering.util*.

Bug: 171670016
Test: atest TetheringCoverageTests
Change-Id: I3bde9ad3c41adf36da99bd944303d88ce992201c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473223
Compare with original change, this change also add visibility
rules for packages/modules/Connectivity/Tethering in new file
(tests/Android.bp).

Merged-In: I3f1d7019f1a12647b78630a412df3adf03e9e95a
Change-Id: I40c22e2f39d795abfd961a3f797e510e51c8ed7c
2020-12-04 10:07:11 +00:00
markchien
75b84e4cb4 Remove unused testutils lib from tethering tests
frameworks-base-testutils is unused in tethering integration tests, so
the dependency can be removed.
That test library also contains test classes, so removing the dependency
allows tethering tests to stop running the associated tests.

Also add jarjar rules to the unit tests to zap (remove) the test classes
from the output APK. Ideally the unit tests should stop depending on
that library too (TestableLooper can be used instead of TestLooper), or
the frameworks-base-testutils library should stop including test
classes.

Bug: 167968946
Test: m CtsTetheringTest TetheringTests

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433924

Merged-In: I3f1d7019f1a12647b78630a412df3adf03e9e95a
Change-Id: Id189676b7447c6cb0f8d9b216c42a34c6513ba61
2020-12-04 10:07:04 +00:00
markchien
1d5b21140c Fix OffloadHardwareInterfaceTest.
r.android.com/1424920 changed the code but forgot to update the
unit test.

Also fix some lint errors.

Bug: 149109043
Test: atest TetheringTests TetheringPrivilegedTests

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440767

Merged-In: I3f1d7019f1a12647b78630a412df3adf03e9e95a
Change-Id: I9fb3be173ddb9314334dab72aebc86c22b7c5aeb
2020-12-04 10:06:57 +00:00
markchien
2dc831401f tethering: offload: Netlink Req NfGen
Add the netfilter generic message header to
the netlink req. This is needed so the kernel
won't ignore the request for invalid params.

Bug: 149109043
Test: ConntrackSocketTest

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424920/

Merged-In: I3f1d7019f1a12647b78630a412df3adf03e9e95a
Change-Id: I63ca166851d6ca2c4737b263dde14c8d794a7d10
2020-12-04 10:06:49 +00:00
markchien
016ee97171 tethering: DAD Proxy Daemon
DAD proxy daemon responsible for forwarding NS/NA between
tethered iface and upstream iface.

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1258645

Merged-In: I3f1d7019f1a12647b78630a412df3adf03e9e95a
Change-Id: I208bcd3f320afb2673ea0a1cbbccd5f32059fe8b
2020-12-04 10:06:39 +00:00
markchien
c0aa632f96 Add tethering privileged test
Create TetheringPrivilegedTests which have MAINLINE_NETWORK_STACK
permission, the test can perform various network-related operations
which need CAP_NET_RAW and CAP_NET_ADMIN capabilities.

Bug: 145490751
Test: make TetheringPrivilegedTests

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345361

Merged-In: I3f1d7019f1a12647b78630a412df3adf03e9e95a
Change-Id: I93f8f6510e12a2a44bc576a4a801c0aac629df25
2020-12-04 10:03:52 +00:00
Remi NGUYEN VAN
f3bc8c4b6d Set noparent in connectivity CTS owners am: d01761e07f am: 7fc54e7294 am: 80c934b7fe
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1516266

Change-Id: I287c02192a32b87b9100ece72259e1a65bb04b8a
2020-12-03 11:50:21 +00: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
5016423e6d Merge "Add a CTS test for NetworkAgent#setUnderlyingNetworks." am: 7d04b2a26c am: 6bd26a9f30 am: b8a7b65506
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1511114

Change-Id: Ie06c01450106f7b8bb4fd247a372420074326954
2020-11-28 04:50:46 +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
80fb08249f Merge changes I82811a97,Ic508b17e,I23ca7980 am: e74700dd5d am: 7b4b6f40a8 am: 57f9551d85
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1512851

Change-Id: I42147c28498b4a5e92102ad08a0725fc012bd8d0
2020-11-27 11:41:19 +00:00
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
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
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
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