Commit Graph

10934 Commits

Author SHA1 Message Date
Lorenzo Colitti
8c84db6854 [automerger skipped] Merge "Migrate away from AsyncChannel in NetworkAgent" am: c9c51b665d am: 39364945d5 am: efb9125a7f -s ours
am skip reason: Change-Id Ica51d0179bcb3b4e314d2c3e85709aead6ca5657 with SHA-1 afe26600fb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc7f85c3b4a67ff96fafbace6c9dc02b799cbe32
2021-01-06 15:22:38 +00:00
Lorenzo Colitti
efb9125a7f Merge "Migrate away from AsyncChannel in NetworkAgent" am: c9c51b665d am: 39364945d5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1484018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie74232c341548340fd893783c8b7186f3f3cb2aa
2021-01-06 14:44:24 +00:00
Lorenzo Colitti
39364945d5 Merge "Migrate away from AsyncChannel in NetworkAgent" am: c9c51b665d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1484018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f81328223159acda1e642823ff7fd0a4df939b9
2021-01-06 14:26:24 +00:00
Lorenzo Colitti
c9c51b665d Merge "Migrate away from AsyncChannel in NetworkAgent" 2021-01-06 14:10:21 +00:00
Chalard Jean
4f896db6ff Migrate away from AsyncChannel in NetworkAgent
Use two oneway binder interfaces instead.
The interfaces post messages to handlers as was implemented before, but
provide a more strictly defined interface, with less hops between
NetworkAgent, AsyncChannel, and ConnectivityService.

Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Merged-In: Ica51d0179bcb3b4e314d2c3e85709aead6ca5657

Change-Id: Ica51d0179bcb3b4e314d2c3e85709aead6ca5657
2020-12-25 11:11:32 +09:00
Remi NGUYEN VAN
705499ecce Merge "Migrate away from AsyncChannel in NetworkAgent" 2020-12-25 01:57:44 +00:00
Chalard Jean
afe26600fb Migrate away from AsyncChannel in NetworkAgent
Use two oneway binder interfaces instead.
The interfaces post messages to handlers as was implemented before, but
provide a more strictly defined interface, with less hops between
NetworkAgent, AsyncChannel, and ConnectivityService.

Exempt-From-Owner-Approval: Owners OOO, change approved by team members
Ignore-AOSP-First: merge conflicts in dependent changes
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Change-Id: Ica51d0179bcb3b4e314d2c3e85709aead6ca5657
2020-12-25 01:52:53 +00:00
Treehugger Robot
afa20212d2 [automerger skipped] Also update connected clients for local only tethering am: 6e7edee44b -s ours
am skip reason: Change-Id I58fdb28efc616b00d63a1c237ea93aee4d8f2dcd with SHA-1 f50f05ebcb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idba1d0dee301dfd9d069dd3f7f5eda1db7992c18
2020-12-24 07:16:13 +00:00
Treehugger Robot
6e7edee44b Also update connected clients for local only tethering
mForwardedDownstreams is the set of downstreams who wanted upstream.
In other word, it don't contains localOnly tethering(e.g. local only
hotspot, wifi p2p tethering). Changing the list from mForwardedDownstreams
to mNotifyList make both tethered and localOnly tethering have connected
clients callback.

Bug: 172290164
Test: atest TetheringTests
Original-Change: https://android-review.googlesource.com/1531561
Merged-In: I58fdb28efc616b00d63a1c237ea93aee4d8f2dcd
Change-Id: I58fdb28efc616b00d63a1c237ea93aee4d8f2dcd
2020-12-23 13:13:37 +00:00
Treehugger Robot
ee3f33ac41 Merge "Also update connected clients for local only tethering" am: 561f38a799 am: 1b1c4adab5 am: 8e1e05ec1e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1531561

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1bb18875a8c458c0ac112c13a277d4e563e3d8ac
2020-12-23 12:49:59 +00:00
Treehugger Robot
8e1e05ec1e Merge "Also update connected clients for local only tethering" am: 561f38a799 am: 1b1c4adab5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1531561

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04ef025ed537623511a3d346d4c59d6efb6bef3f
2020-12-23 12:31:53 +00:00
Treehugger Robot
1b1c4adab5 Merge "Also update connected clients for local only tethering" am: 561f38a799
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1531561

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac33537cf02456f4e1fce918ecfa7106749fcfd0
2020-12-23 12:14:19 +00:00
Treehugger Robot
561f38a799 Merge "Also update connected clients for local only tethering" 2020-12-23 11:36:34 +00:00
markchien
f50f05ebcb Also update connected clients for local only tethering
mForwardedDownstreams is the set of downstreams who wanted upstream.
In other word, it don't contains localOnly tethering(e.g. local only
hotspot, wifi p2p tethering). Changing the list from mForwardedDownstreams
to mNotifyList make both tethered and localOnly tethering have connected
clients callback.

Bug: 172290164
Test: atest TetheringTests
Change-Id: I58fdb28efc616b00d63a1c237ea93aee4d8f2dcd
2020-12-22 23:23:09 +08:00
Chalard Jean
9c6593c0e8 [automerger skipped] Merge "Move module utils to the module package." am: fab11bb263 am: e3db31f347 am: f0c1648742 -s ours
am skip reason: Change-Id Ib04bebb061dc64d6d685116b596fb3179d5b959a with SHA-1 7f65953491 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I265fa049bd3b1a0e38524ff2bf0b939afbb97880
2020-12-22 06:58:32 +00:00
Chalard Jean
f0c1648742 Merge "Move module utils to the module package." am: fab11bb263 am: e3db31f347
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1531558

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d9c29e041caba754e4cb72167678234707484d3
2020-12-21 06:33:30 +00:00
Chalard Jean
e3db31f347 Merge "Move module utils to the module package." am: fab11bb263
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1531558

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ef4ad9424dbe2ab620562276ba93da296e232b7
2020-12-21 06:11:51 +00:00
Remi NGUYEN VAN
7ecf53ec21 Fix timeout on NetworkAgentTest callback am: abb46bef36 am: 44cc38ce67 am: bc1e892463
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1530739

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb92470433df1f096261968d9d10a1e314ab705b
2020-12-21 05:46:55 +00:00
Chalard Jean
fab11bb263 Merge "Move module utils to the module package." 2020-12-21 05:35:09 +00:00
Remi NGUYEN VAN
bc1e892463 Fix timeout on NetworkAgentTest callback am: abb46bef36 am: 44cc38ce67
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1530739

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b96c910b95684b27ef8db2fa53c1b88953b6111
2020-12-21 05:21:03 +00:00
Remi NGUYEN VAN
44cc38ce67 Fix timeout on NetworkAgentTest callback am: abb46bef36
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1530739

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide74cc0ae04e6ab900ec56bcaaf3f69c15c9679e
2020-12-21 05:03:19 +00:00
Orion Hodson
cba4648668 [automerger skipped] Use libnetjniutils for JNI File Descriptor info am: c544667c3c -s ours
am skip reason: Change-Id Ic1a1811ffb9a1c207f562a180417e99df31e3502 with SHA-1 e5bd0dba21 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc2fd9e62fa08e6fed4aa8036334061976554ef8
2020-12-21 02:20:48 +00:00
Orion Hodson
c544667c3c 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
Merged-In: Ic1a1811ffb9a1c207f562a180417e99df31e3502
2020-12-17 03:09:55 +00:00
Remi NGUYEN VAN
abb46bef36 Fix timeout on NetworkAgentTest callback
All callbacks in the class use the DEFAULT_TIMEOUT_MS, except for this recently
added test.

The test is currently flaky in various branches.
Fixes: 174716714
Fixes: 174691729
Change-Id: I9f4446bb83eb4402c912292ac31d46e1d2cb6a52
Test: TH
2020-12-16 06:29:20 +00:00
Remi NGUYEN VAN
6a2a355206 Move cts/net/TEST_MAPPING to toplevel am: 9b6b353b5d am: 69963e8600 am: d2c83f152a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1529961

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2778ead9d69a36d7e3b23be98e18b318f00f40b7
2020-12-16 03:20:33 +00:00
Chalard Jean
d2df5729f6 Move module utils to the module package.
Test: FrameworksWifiTest FrameworksNetTest
Merged-In: Ib04bebb061dc64d6d685116b596fb3179d5b959a
Change-Id: I9118da3898d864c7bf0ed7bc9d94b94343c4a084
2020-12-16 11:44:34 +09:00
Remi NGUYEN VAN
d2c83f152a Move cts/net/TEST_MAPPING to toplevel am: 9b6b353b5d am: 69963e8600
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1529961

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2133df5a4f651c80e25d9af7d13a1bac04cd2d0d
2020-12-16 02:33:13 +00:00
Remi NGUYEN VAN
69963e8600 Move cts/net/TEST_MAPPING to toplevel am: 9b6b353b5d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1529961

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0219dd593ea4139529b5432f900487a9c8247bdc
2020-12-16 01:56:10 +00:00
Remi NGUYEN VAN
9b6b353b5d Move cts/net/TEST_MAPPING to toplevel
The tests should just be run on any change in packages/modules/Connectivity,
not just changes in the CTS package.

Change-Id: I1c86c402f39a8a9b84e7422445df289c3ea7842f
Test: TEST_MAPPING needs to be verified by TH
2020-12-15 09:39:58 +00:00
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