Commit Graph

8121 Commits

Author SHA1 Message Date
Junyu Lai
024c657139 Merge "[VCN06.1] Add CTS for request background network" am: 5b39b66544
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552050

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3568a450c50af90c194e9c563f26f21d5067b360
2021-01-19 01:12:58 +00:00
Junyu Lai
5b39b66544 Merge "[VCN06.1] Add CTS for request background network" 2021-01-19 01:04:20 +00:00
junyulai
f8370c08be [VCN06.1] Add CTS for request background network
Test: android.net.cts.ConnectivityManagerTest#testRequestBackgroundNetwork
Bug: 175662146
Change-Id: I8042ce1971c728a9f900d090c0c4cabd994820bf
2021-01-18 16:32:33 +08:00
Nucca Chen
79f0ca8849 Merge "[NFCT.TETHER.2] Migrate tetherOffloadRuleAdd from netd to mainline" am: 6bc18e6d2c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1536562

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a1d3871bf767043cc2845811aef33fc838ac017
2021-01-18 07:05:40 +00:00
Nucca Chen
6bc18e6d2c Merge "[NFCT.TETHER.2] Migrate tetherOffloadRuleAdd from netd to mainline" 2021-01-18 06:37:23 +00:00
Les Lee
8f9ffbb097 Merge "wifi: Add bridged pre-fix for tethering interface" am: 7e9e19c1ea
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1542725

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ff84ff6d02ddd20c6ae73c194378ed6a96338cd
2021-01-18 01:58:04 +00:00
Les Lee
7e9e19c1ea Merge "wifi: Add bridged pre-fix for tethering interface" 2021-01-18 01:21:45 +00:00
lesl
6a953ef4d3 wifi: Add bridged pre-fix for tethering interface
In bridged mode, the tethered interface will include the prefix ap_br_

Bug: 162686273
Test: Manual Test - bridged AP enabled success
and client can connected it and get the IP address
Test: atest -c NetworkStackTests
Test: atest -c FrameworksNetTests
Test: atest -c CtsNetTestCasesLatestSdk
Change-Id: I89ae178c658a42f902199afaed89ec798de54643
2021-01-18 01:21:32 +00:00
Remi NGUYEN VAN
6bc4e3c9db Skip NetworkAgentTest on R- am: 4bf203d065
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552215

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d5f21e51e7221b1dbbb4a104c8f09e55e323934
2021-01-15 09:17:05 +00:00
Hungming Chen
dd55b91228 [NFCT.TETHER.2] Migrate tetherOffloadRuleAdd from netd to mainline
A preparation for updating BPF map in mainline module.

Test: atest TetheringCoverageTests
Change-Id: I6f8667bf110dae3e2805c2752ff59e7284a7bce0
2021-01-15 17:10:58 +08:00
Remi NGUYEN VAN
4bf203d065 Skip NetworkAgentTest on R-
NetworkAgent is not updatable on R-, so there is no need to run tests
compiled against S on older platforms. They are also incompatible
because NetworkAgent stopped using AsyncChannel in S.

This only affects MTS, and CTS used to test S+ devices. CTS for R-
devices is already cut in a branch that this change will not merge to.

Bug: 177290955
Change-Id: I85c137a1b5fd7ef701fba4623566df5a8fb707a3
Test: atest CtsNetTestCasesLatestSdk
2021-01-15 07:45:29 +00:00
Maciej Żenczykowski
034c6c7d12 Merge "Use header module bpf_syscall_wrappers" am: 539d0e27cf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1549715

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8eb6814c2000a5a015f0656030e57a6e56ae9c8
2021-01-14 08:03:06 +00:00
Maciej Żenczykowski
539d0e27cf Merge "Use header module bpf_syscall_wrappers" 2021-01-14 07:36:50 +00:00
Treehugger Robot
d0516927eb Merge "Net CTS: move NsdManagerTest from Wifi CTS" am: 26b0cf3261
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1548094

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I31f8d9e5b4f9b866380c2c588cdbe9f9d5b7e8dc
2021-01-14 04:41:33 +00:00
Treehugger Robot
26b0cf3261 Merge "Net CTS: move NsdManagerTest from Wifi CTS" 2021-01-14 03:51:17 +00:00
David Su
cd1851e0a2 Net CTS: move NsdManagerTest from Wifi CTS
NsdManagerTest is not owned by Wifi, so it doesn't
belong in Wifi CTS.

Bug: 176902925
Test: atest CtsNetTestCases
Change-Id: I8eb3cba7a3b2ff24a012cca8d3fdff173e88c69a
2021-01-14 03:47:25 +00:00
Hungming Chen
400702b6bb Use header module bpf_syscall_wrappers
Use the versioned header library instead of just including
the header files.

Test: atest BpfMapTest
Change-Id: Icf23dcdc051a4ead6a7c6e925159cdc27f49eac2
2021-01-13 14:31:28 +08:00
Patrick Rohr
cf8096729f Merge "Add CTS test for Restricted Networking Mode" am: 99f6c312ef
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1545724

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee0461ea66a212db9cef6d2676742c707e567a95
2021-01-12 20:34:22 +00:00
Patrick Rohr
99f6c312ef Merge "Add CTS test for Restricted Networking Mode" 2021-01-12 17:41:19 +00:00
Hungming Chen
0276690274 Follow-up CL to the change at aosp/1498277 am: 7d05e6fddd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1547695

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic5be309b537bcfaa0bee44623164153da8575c96
2021-01-12 14:39:20 +00:00
Hungming Chen
7d05e6fddd Follow-up CL to the change at aosp/1498277
1. Correct the API annotation.
2. The entry deletion failure causes the exception in cleanTestMap().
3. Use AtomicInteger to be the counter in the lambda.

Test: atest BpfMapTest
Change-Id: I4a56038881a38bda993ef5303b71f0e2a99f03d1
2021-01-12 19:08:15 +08:00
Nucca Chen
5a90ec8297 Merge "Provide a easy way to access bpf maps from java" am: 12067258b2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1498277

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id80e11ce843b4b2ef8578ee6b72368450288afaa
2021-01-12 08:22:36 +00:00
Nucca Chen
12067258b2 Merge "Provide a easy way to access bpf maps from java" 2021-01-12 08:06:03 +00:00
Remi NGUYEN VAN
f3b8223844 Merge "Revert^2 "Add service-connectivity to tethering APEX"" am: 73fa31b404
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1542627

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I15564a42939ccdc54954e4d130b6236bde94864b
2021-01-12 02:05:58 +00:00
Remi NGUYEN VAN
73fa31b404 Merge "Revert^2 "Add service-connectivity to tethering APEX"" 2021-01-12 01:35:30 +00:00
markchien
7052688dde Provide a easy way to access bpf maps from java
A wrapper for bpf map opening, reading/writing, and iteration.

Bug: 173167302
Test: atest BpfMapTest

Change-Id: I792b41978b322c9e4969cd7b6c35d6978ab86bc4
2021-01-11 17:43:27 +08:00
Patrick Rohr
4df8a7aef1 Add CTS test for Restricted Networking Mode
Test: atest com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Bug: 175281879
Bug: 170323671
Change-Id: Ic69e7e029debeea1f131242fb2baad2796d4768c
2021-01-11 09:47:04 +01:00
lucaslin
8c250ac624 Move BaseNetdUnsolicitedEventListener to frameworks/libs/net am: ee661dfb59
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1517960

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iabf789de27e571c05bacb912d9c59a4357ffb549
2021-01-11 02:05:04 +00:00
lucaslin
ee661dfb59 Move BaseNetdUnsolicitedEventListener to frameworks/libs/net
Move BaseNetdUnsolicitedEventListener to frameworks/libs/net and
create a new library - netd-client for using.
Also remove netd_aidl_interface-unstable-java since netd-client
links to the stable one.

Bug: 174837473
Test: Manual test and check the log.
Change-Id: Id65142b8c13a6cccbfe387d4ab757967497546e6
2021-01-08 01:55:53 +00:00
Remi NGUYEN VAN
2812f607a0 Revert^2 "Add service-connectivity to tethering APEX"
Add the connectivity service JAR to the tethering APEX.
This change should not be released in monthly updates until the
modularization work is done, so will be reverted in module release
branches.

This rolls forward the change. The original topic was reverted because
of a bad merged-in clause; this is fixed and re-verified in this topic.

Test: Boot, wifi connects and has internet access
Bug: 171540887

Change-Id: Ib0ac49609e444a53a6fee4575f5078e15f364eef
2021-01-08 01:24:36 +00:00
Sudheer Shanka
eccfb47e5b Merge "Increase the wait timeout for meteredness to change." am: edb6669cf1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1538985

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9908365b2393fd718bd1a5cda4d6839bc96eb869
2021-01-07 23:15:29 +00:00
Sudheer Shanka
edb6669cf1 Merge "Increase the wait timeout for meteredness to change." 2021-01-07 22:56:48 +00:00
Treehugger Robot
67650555b1 Merge "Revert "Add service-connectivity to tethering APEX"" am: 4f430ae5ec
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1541543

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9c9262fde00878772232e0428688a1b0e285fa9
2021-01-07 17:58:14 +00:00
Treehugger Robot
4f430ae5ec Merge "Revert "Add service-connectivity to tethering APEX"" 2021-01-07 15:25:03 +00:00
Pete Bentley
850ca6f6b4 Revert "Add service-connectivity to tethering APEX"
Revert "Set setCurrentProxyScriptUrl as public"

Revert submission 1532910-connectivity_jar_in_apex

Reason for revert: Breaks boot tests: b/176969905
Reverted Changes:
Ie41a5b569:Set setCurrentProxyScriptUrl as public
Id7b6a4664:Move service-connectivity to the tethering APEX
Ia7cb83834:Add service-connectivity to tethering APEX

Change-Id: I9f31d4810a92e620f02cc8d24bdf18fe28001a2b
2021-01-07 13:51:18 +00:00
Lorenzo Colitti
3ebe8d0394 Merge "Add service-connectivity to tethering APEX" am: 7998551cdc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1488520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c0d1b1c0247d66f9a962da824da73d05101774c
2021-01-07 09:26:30 +00:00
Lorenzo Colitti
7998551cdc Merge "Add service-connectivity to tethering APEX" 2021-01-07 08:34:25 +00:00
Remi NGUYEN VAN
bd5cc4231d Add service-connectivity to tethering APEX
Add the connectivity service JAR to the tethering APEX.
This change should not be released in monthly updates until the
modularization work is done, so will be reverted in module release
branches.

Test: Boot, wifi connects and has internet access
Bug: 171540887
Merged-In: Ic496cd62be8c90928ccc619519ebe517beea78f0

Change-Id: Ia7cb83834b854e8c495c4ef17ec69ad032509208
2021-01-07 06:17:33 +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
Sudheer Shanka
796f29c09e Increase the wait timeout for meteredness to change.
Bug: 170241174
Bug: 174808291
Test: atest CtsHostsideNetworkTests:HostsideRestrictBackgroundNetworkTests
Change-Id: I3af17819a403958d88a30af7f6346e5bb96b2828
2021-01-05 06:37:56 +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
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
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
Chalard Jean
fab11bb263 Merge "Move module utils to the module package." 2020-12-21 05:35:09 +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
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
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