Commit Graph

46085 Commits

Author SHA1 Message Date
Treehugger Robot
124a10d374 Merge "Add tethering IPv4 UDP forwarding test" am: 76bc75f0a2 am: 8003834727 am: 3b8bd6eca7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1843121

Change-Id: I8d73c62fb77ebd10135b8e1ef2fa43b683d87afa
2022-01-03 14:11:54 +00:00
Treehugger Robot
3b8bd6eca7 Merge "Add tethering IPv4 UDP forwarding test" am: 76bc75f0a2 am: 8003834727
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1843121

Change-Id: I2939057dfd9459e554846cf2239effba7d9bd2b6
2022-01-03 14:03:42 +00:00
Treehugger Robot
8003834727 Merge "Add tethering IPv4 UDP forwarding test" am: 76bc75f0a2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1843121

Change-Id: I3a2cee7185a970c045a006c4a548c19b184896c8
2022-01-03 13:55:21 +00:00
Treehugger Robot
76bc75f0a2 Merge "Add tethering IPv4 UDP forwarding test" 2022-01-03 13:47:12 +00:00
Les Lee
15e48292e1 Merge "wifi data usage: replaced Wi-Fi SSID with a Wi-Fi network key" am: 719ce67677 am: 28df48c743 am: fe44c47335
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1916599

Change-Id: I54acc2f35e855f0061c26481dd3403fd70b8fbaa
2022-01-03 13:03:22 +00:00
Les Lee
fe44c47335 Merge "wifi data usage: replaced Wi-Fi SSID with a Wi-Fi network key" am: 719ce67677 am: 28df48c743
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1916599

Change-Id: Id57ddf598a0b5ef3ab5102f2cd4da6f50cac67a4
2022-01-03 12:55:11 +00:00
Les Lee
28df48c743 Merge "wifi data usage: replaced Wi-Fi SSID with a Wi-Fi network key" am: 719ce67677
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1916599

Change-Id: Ida369b404e8f29d040411d3333b3f7c99d01b4be
2022-01-03 12:45:52 +00:00
Les Lee
719ce67677 Merge "wifi data usage: replaced Wi-Fi SSID with a Wi-Fi network key" 2022-01-03 12:36:49 +00:00
Hungming Chen
bb8e9dae7f Add tethering IPv4 UDP forwarding test
This is a preparation for testing IPv4 BPF offload.
- Add an ARP responder.
- Add a basic UDP forwarding test.

Test: atest EthernetTetheringTest
Change-Id: I720a5a2c4b97493eb6a5570cecd73dfc1eabf5cd
2022-01-03 07:16:16 +00:00
Les Lee
c728c36ca7 wifi data usage: replaced Wi-Fi SSID with a Wi-Fi network key
1. Used SSID to be a wifi network identity can't separate wifi
data usage when there are two different network with same SSID.
Use a new usage key from in WifiInfo to replace wifi SSID to
solve this issue.

2. To support to query wifi usage per configured Wifi network.
Adding matchWifiNetworkKeys in NetworkTemplate to support querying
multi networkKeys wifi data usage since each configured Wifi
network configuration might be used to connect different Wifi
network.

a. Replaced wording SSID with key of the wifi network
b. Add mock to handle get wifi network key from WifiInfo
c. Add null/empty set unit test to verify matchWifiNetworkKeys

Bug: 197520752
Bug: 126299427
Test: atest -c NetworkTemplateTest
Test: atest -c NetworkStatsServiceTest
Test: atest -c NetworkPolicyManagerServiceTest
Change-Id: Id7d66f6548dd1b4e657db8d7427213293618b406
2022-01-03 15:13:45 +08:00
Treehugger Robot
0325aa9792 Merge "[MS26.2] Remove Process.NETWORK_STACK_UID dependency" am: 1065477cd7 am: ef1988c368 am: 74aa4827ee
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934185

Change-Id: I63fbb6bb871cd3c039611f222e9490303bb40473
2021-12-30 13:06:05 +00:00
Treehugger Robot
74aa4827ee Merge "[MS26.2] Remove Process.NETWORK_STACK_UID dependency" am: 1065477cd7 am: ef1988c368
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934185

Change-Id: Ib28acac5bfac14db5bedbf6fdb0bafc3880d99ac
2021-12-30 13:00:06 +00:00
Treehugger Robot
ef1988c368 Merge "[MS26.2] Remove Process.NETWORK_STACK_UID dependency" am: 1065477cd7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934185

Change-Id: Ia0504bcf2b5fa009e972340baf383048ec42bdcd
2021-12-30 12:55:14 +00:00
Treehugger Robot
1065477cd7 Merge "[MS26.2] Remove Process.NETWORK_STACK_UID dependency" 2021-12-30 12:43:39 +00:00
Maciej Żenczykowski
1402d58573 bpf_connectivity_headers -> bpf_headers -> bpf_syscall_wrappers am: 4d491bb86e am: 7eb78f0e6d am: fa7374f57f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934675

Change-Id: Ic5371cca8f68ced8d5e0f8dd8cd1bbccdc0a3f89
2021-12-30 10:14:38 +00:00
Maciej Żenczykowski
fa7374f57f bpf_connectivity_headers -> bpf_headers -> bpf_syscall_wrappers am: 4d491bb86e am: 7eb78f0e6d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934675

Change-Id: I90f1a9a2e983fc03645314b3ae042bf3ac72d9f9
2021-12-30 09:55:59 +00:00
Maciej Żenczykowski
7eb78f0e6d bpf_connectivity_headers -> bpf_headers -> bpf_syscall_wrappers am: 4d491bb86e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934675

Change-Id: I5a6fb1f5dc22ddc382269aa691b39d31c89fc8f8
2021-12-30 09:44:25 +00:00
Maciej Żenczykowski
4d491bb86e bpf_connectivity_headers -> bpf_headers -> bpf_syscall_wrappers
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I5db6285add895edf9354e98d9dffc8343ee4b259
2021-12-28 17:58:20 -08:00
Chiachang Wang
2ccd1bc3ea Merge "Add NetworkProviderTest#testRegisterNetworkOffer back into test" am: e4ee88f108 am: d8f3d2c774 am: a64b5db0d8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934177

Change-Id: Iaa096c8d8c656962fcb764c0097d45cef2249dd9
2021-12-28 10:03:35 +00:00
Junyu Lai
289db92ba4 [MS26.2] Remove Process.NETWORK_STACK_UID dependency
Check NetworkStack permission instead.

Test: NetworkStatsAccessTest
Bug: 20483022
Change-Id: Ie345cfa7dec8e001246efec8a27a1dc67a5c989c
2021-12-28 10:00:43 +00:00
Chiachang Wang
a64b5db0d8 Merge "Add NetworkProviderTest#testRegisterNetworkOffer back into test" am: e4ee88f108 am: d8f3d2c774
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934177

Change-Id: I71817014959d38219f6bb063d3d784b096a5fc43
2021-12-28 09:54:40 +00:00
Chiachang Wang
d8f3d2c774 Merge "Add NetworkProviderTest#testRegisterNetworkOffer back into test" am: e4ee88f108
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934177

Change-Id: I67ece64f257cfd66c4c9cb65526e493bd43bc64c
2021-12-28 09:42:23 +00:00
Chiachang Wang
e4ee88f108 Merge "Add NetworkProviderTest#testRegisterNetworkOffer back into test" 2021-12-28 09:24:16 +00:00
Chiachang Wang
3220389541 Merge "Allow VPN network agent to exclude local traffic" am: a7b3d00968 am: 3ded8323ea am: 6a0d0c5579
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927018

Change-Id: I958918559aaf4447e45f7dcde65d2b50caabcb1a
2021-12-28 08:22:57 +00:00
Chiachang Wang
6a0d0c5579 Merge "Allow VPN network agent to exclude local traffic" am: a7b3d00968 am: 3ded8323ea
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927018

Change-Id: I4a7d56abb55dee7c95aaa5584f6273504f0aa16c
2021-12-28 08:09:40 +00:00
Chiachang Wang
3ded8323ea Merge "Allow VPN network agent to exclude local traffic" am: a7b3d00968
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927018

Change-Id: Ie569c72d63ce866b08bd6ccb18f7b0ef1437f6d3
2021-12-28 07:57:44 +00:00
Chiachang Wang
a7b3d00968 Merge "Allow VPN network agent to exclude local traffic" 2021-12-28 07:45:20 +00:00
Chiachang Wang
bb754d6cc5 Allow VPN network agent to exclude local traffic
Add API to allow network agent to set whether the local traffic
is excluded from the network. This commit is nonfunctional
currently but only storing the boolean inside the NAI.

Bug: 184750836
Test: atest FrameworksNetTests
Change-Id: I3799216ac8fdf22eb4bcabc6c6136d8edbf69360
2021-12-28 11:13:21 +08:00
Lucas Lin
2c8a9184d4 [automerger skipped] Merge "Add test for Vpn#prepare()" into sc-dev am: f89a629776 am: 66737a8c5d am: 3de047cb32 -s ours
am skip reason: Merged-In Ibe0b245561b00442a6377fb849603f8b9026e9c4 with SHA-1 f76481568d is already in history

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

Change-Id: I40470c84f2d147e97a347a402bec2ed4dcc45c0b
2021-12-27 17:51:08 +00:00
Lucas Lin
3de047cb32 Merge "Add test for Vpn#prepare()" into sc-dev am: f89a629776 am: 66737a8c5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15606164

Change-Id: Icec2f3508932abd460b2605881b54c5d0cfafb35
2021-12-27 17:35:31 +00:00
Treehugger Robot
1310153162 Merge "Add the fixed test case back into presubmit" am: 3763316aeb am: 89763b0ba3 am: e4f38d3d54
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930827

Change-Id: I56faa65ab4e5900d30affca0475819a26d999c68
2021-12-27 10:36:34 +00:00
Treehugger Robot
e4f38d3d54 Merge "Add the fixed test case back into presubmit" am: 3763316aeb am: 89763b0ba3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930827

Change-Id: Ia3044257db56333b8ce2e2819dea41f21329ab0a
2021-12-27 10:26:00 +00:00
Treehugger Robot
89763b0ba3 Merge "Add the fixed test case back into presubmit" am: 3763316aeb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930827

Change-Id: Ie127f5ed35a50952eab0b5049fdd6259c04124e2
2021-12-27 10:14:26 +00:00
Treehugger Robot
3763316aeb Merge "Add the fixed test case back into presubmit" 2021-12-27 10:02:52 +00:00
Chiachang Wang
69761b4c1c Add NetworkProviderTest#testRegisterNetworkOffer back into test
This test was temporarily disabled because prebuilt module is not
updated in the branch. Now the prebuilt was S already, so add the
test back to test to ensure the coverage.

Test: atest FrameworksNetTests CtsNetTestCases
Bug: 189074532
Change-Id: I510f457d2869c2904404fe7ef55828e84636e4c5
2021-12-27 03:30:47 +00:00
Chiachang Wang
1ce08489d1 Merge "Dump target sdk version for ConnectivityCoverageTests into 31" am: e32642e752 am: 0400333c8a am: 1d110cf84e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930831

Change-Id: I3d5a885b582f6e764a166116eeaff8030c2d4703
2021-12-27 01:54:15 +00:00
Chiachang Wang
1d110cf84e Merge "Dump target sdk version for ConnectivityCoverageTests into 31" am: e32642e752 am: 0400333c8a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930831

Change-Id: I87cbe460236fe40df182a5b0de82e05494a6708c
2021-12-27 01:39:15 +00:00
Chiachang Wang
0400333c8a Merge "Dump target sdk version for ConnectivityCoverageTests into 31" am: e32642e752
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930831

Change-Id: I58c5eba26eab67baf88a9aea34e5ac9bdea03eff
2021-12-27 01:21:08 +00:00
Chiachang Wang
e32642e752 Merge "Dump target sdk version for ConnectivityCoverageTests into 31" 2021-12-27 01:09:04 +00:00
Treehugger Robot
7a3aeaf8c1 Merge "Add enterpriseSpecifier" am: fbe500351e am: 35dfb16fbb am: 59c87b9ebc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919260

Change-Id: I19d331f43177955bba7c1b3d1a43f81dd3b750fc
2021-12-23 23:17:04 +00:00
Treehugger Robot
59c87b9ebc Merge "Add enterpriseSpecifier" am: fbe500351e am: 35dfb16fbb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919260

Change-Id: I14738d24a8b141705e57384c9d826dce9e5a881b
2021-12-23 22:57:44 +00:00
Treehugger Robot
35dfb16fbb Merge "Add enterpriseSpecifier" am: fbe500351e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919260

Change-Id: I3e62f238737526540c72f3f9f6ddb2bb43a8a3b2
2021-12-23 22:40:01 +00:00
Treehugger Robot
fbe500351e Merge "Add enterpriseSpecifier" 2021-12-23 22:25:20 +00:00
Maciej Żenczykowski
cad5920d8c Merge "Add bpf jni into connectivity module" am: 577c46a185 am: 74b4a89337 am: bc13d619fb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1888502

Change-Id: Ib2410bcc02d1c024d9f2e6ba73e4fd730e497c26
2021-12-23 19:40:50 +00:00
Maciej Żenczykowski
bc13d619fb Merge "Add bpf jni into connectivity module" am: 577c46a185 am: 74b4a89337
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1888502

Change-Id: Ia37af58ba6f8f4372493e1646c1931005b1fb439
2021-12-23 19:21:59 +00:00
Maciej Żenczykowski
74b4a89337 Merge "Add bpf jni into connectivity module" am: 577c46a185
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1888502

Change-Id: Ifb12b3a523cb6e5df4ef182c37abcaa95ac1dc94
2021-12-23 19:02:19 +00:00
Maciej Żenczykowski
577c46a185 Merge "Add bpf jni into connectivity module" 2021-12-23 18:44:48 +00:00
Sooraj Sasindran
4196937bdd Add enterpriseSpecifier
Add enterpriseSpecifier to network capability

Bug: 194332512
CTS-Coverage-Bug: 211133973
Test: CTS and unit test.
Change-Id: If16c8e17cee71cc6788c43a8818bcca68a00bf99
2021-12-23 09:32:20 -08:00
Lucas Lin
5588b547da Merge "[conflict] Merge "Add test for Vpn#prepare()" into sc-dev am: f89a629776 am: 66737a8c5d" into sc-qpr1-dev-plus-aosp am: cbab8c3ca9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16527483

Change-Id: I1377033f88bd4a2dbb0bc6a79aad6f369b9fc62c
2021-12-23 15:37:16 +00:00
Lucas Lin
cbab8c3ca9 Merge "[conflict] Merge "Add test for Vpn#prepare()" into sc-dev am: f89a629776 am: 66737a8c5d" into sc-qpr1-dev-plus-aosp 2021-12-23 15:23:55 +00:00