Taras Antoshchuk
1a6d19e4b8
Revert "Revert "Add CTS tests for exclude VPN routes APIs""
...
This reverts commit f4882153ed .
Reason for revert: failing build target configuration is fixed
Change-Id: Ic8ed8fce72a1c816ee6766f296efaddeafcd2f70
2022-01-05 14:00:25 +01:00
Treehugger Robot
55180757fb
Merge "[MS33.2] Remove NetdService dependency" am: ee7ca130dc am: ac65d203f0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935969
Change-Id: Ib124d7c4a4be5274b504946640c4a9ec1c5fbd3f
2022-01-05 11:17:43 +00:00
Treehugger Robot
ac65d203f0
Merge "[MS33.2] Remove NetdService dependency" am: ee7ca130dc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935969
Change-Id: I35fb80fc8cfb90760be7b11f58c1a7746c417c44
2022-01-05 11:01:20 +00:00
Treehugger Robot
ee7ca130dc
Merge "[MS33.2] Remove NetdService dependency"
2022-01-05 10:39:13 +00:00
Junyu Lai
a9b4fa7248
[MS32.2] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage
...
Replace intent receiver with callback listener.
Test: atest com.android.server.net.NetworkStatsServiceTest
Bug: 204830222
Change-Id: I07ef87b08b5d177719a82f79a2866d72b003fb5a
2022-01-05 05:31:05 +00:00
Junyu Lai
851fb24667
[MS34.2] Replace TelephonyManager#getSubscriberId(subId) with public API
...
Test: atest com.android.server.net.NetworkStatsSubscriptionsMonitorTest
Bug: 204830222
Change-Id: I53cdf9a83a38ea6921bff02be48bc14a4012ba36
2022-01-05 05:31:05 +00:00
Junyu Lai
37880f857a
[MS33.2] Remove NetdService dependency
...
This change pass INetd to NetworkStatsFactory to replace
NetdService#getNetdInstance.
Test: atest FrameworksNetTests
Bug: 204830222
Change-Id: I0756188adb394fa5343c8d2ae354567df63acf21
2022-01-05 05:30:39 +00:00
lucaslin
6044b11a9c
Caps callback should be called when underlying networks are changed am: 36faae95ba am: 0be0f9dc54
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1838424
Change-Id: I1ebba7deac03a3c3e4f57ceacd44e141b5f4955f
2022-01-05 03:55:13 +00:00
lucaslin
0be0f9dc54
Caps callback should be called when underlying networks are changed am: 36faae95ba
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1838424
Change-Id: I1fb110a8e4e3c9a1665b978b08b6697910371789
2022-01-05 03:44:37 +00:00
lucaslin
36faae95ba
Caps callback should be called when underlying networks are changed
...
Add a test to check if onCapabilitiesChanged will be called when
the underlying networks are changed.
Bug: 191918368
Test: atest CtsHostsideNetworkTests:HostsideVpnTests
Change-Id: I8dfb16e01199d41b1b65f69e129ec40e37f9ab0f
2022-01-04 15:27:11 +08:00
Treehugger Robot
05ed2b9a6f
Merge "[MS25.2] Remove AppOpsManager.OP_GET_USAGE_STATS dependency" am: 90cf8dbd92 am: 86d23e7da9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934184
Change-Id: I8e256c8b7fc2c83bf6398b3d87a793a49f50c554
2022-01-03 23:17:36 +00:00
Treehugger Robot
86d23e7da9
Merge "[MS25.2] Remove AppOpsManager.OP_GET_USAGE_STATS dependency" am: 90cf8dbd92
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934184
Change-Id: I45c8eb61ae26e4a0fd22980c259406f2c09a0331
2022-01-03 23:00:36 +00:00
Treehugger Robot
90cf8dbd92
Merge "[MS25.2] Remove AppOpsManager.OP_GET_USAGE_STATS dependency"
2022-01-03 22:41:30 +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
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
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
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
Junyu Lai
9051e66b22
[MS25.2] Remove AppOpsManager.OP_GET_USAGE_STATS dependency
...
Replaced by public interface.
Test: TH
Bug: 204830222
Change-Id: I1071bcaa74429885165d9dc8d1b02a1c1c48c685
2021-12-28 10:00:43 +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
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
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
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
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
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