Commit Graph

46117 Commits

Author SHA1 Message Date
Siim Sammul
2cacd18d82 Include "generate_transaction_name" in the aidl build rules for am: cd4c8228bd am: 41e2be2aa8 am: 0424edbecf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1918669

Change-Id: Ie1e8da01d590d6710bbebe7e0a864f130dad7791
2022-01-07 12:27:46 +00:00
Siim Sammul
0424edbecf Include "generate_transaction_name" in the aidl build rules for am: cd4c8228bd am: 41e2be2aa8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1918669

Change-Id: I8ae1bf9e30ebce2a9f2ef7d9c288745453416b49
2022-01-07 12:08:34 +00:00
Siim Sammul
41e2be2aa8 Include "generate_transaction_name" in the aidl build rules for am: cd4c8228bd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1918669

Change-Id: I40bb8fa0ba1de9804b692318bae113e20e87493e
2022-01-07 11:54:52 +00:00
Siim Sammul
cd4c8228bd Include "generate_transaction_name" in the aidl build rules for
Connectivity as otherwise method names are not visible in the collected
binder latency data.

Test: N/A
Bug: 208515821
Change-Id: I0e6c6dcd4663f0abe473d39f7de4c718ac3fb66f
2022-01-06 15:21:13 +00:00
Junyu Lai
51b14b066f Merge "[MS32.2] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage" am: 392161e651 am: 89d6bdf330 am: 5bdd14b848
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935967

Change-Id: Ib3d96cd7d86f44fd0431ca8803c4891b16e91a55
2022-01-06 14:24:10 +00:00
Junyu Lai
c29114ba64 Merge "[MS34.2] Replace TelephonyManager#getSubscriberId(subId) with public API" am: 38e0582797 am: 13f0d24647 am: 1b69ac1a18
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935970

Change-Id: I48c9ab49883577cee3d17c7310d7d31a4b3109c7
2022-01-06 14:23:37 +00:00
Junyu Lai
5bdd14b848 Merge "[MS32.2] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage" am: 392161e651 am: 89d6bdf330
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935967

Change-Id: I3ab051c2745baab3081cbeb91daf5d10aaee168c
2022-01-06 14:09:50 +00:00
Junyu Lai
1b69ac1a18 Merge "[MS34.2] Replace TelephonyManager#getSubscriberId(subId) with public API" am: 38e0582797 am: 13f0d24647
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935970

Change-Id: Ibc05a4867e8ed2722352245e383313dba02448ff
2022-01-06 14:09:31 +00:00
Junyu Lai
89d6bdf330 Merge "[MS32.2] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage" am: 392161e651
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935967

Change-Id: I50d2557ea2280947bdfaba097c68eefdcae767a9
2022-01-06 14:04:04 +00:00
Junyu Lai
13f0d24647 Merge "[MS34.2] Replace TelephonyManager#getSubscriberId(subId) with public API" am: 38e0582797
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935970

Change-Id: I480abeaeb984f4fdfbeac006ab88cb9357e42fa5
2022-01-06 14:02:58 +00:00
Junyu Lai
392161e651 Merge "[MS32.2] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage" 2022-01-06 13:57:12 +00:00
Junyu Lai
38e0582797 Merge "[MS34.2] Replace TelephonyManager#getSubscriberId(subId) with public API" 2022-01-06 13:56:39 +00:00
James Mattis
aa1b8d9c11 Update to ConnectivityService to use utils am: 4ab1ffca29 am: 241bbaddf3 am: 2dc89ff07a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934218

Change-Id: I168753da01edee9889cd1cb6915f94ec294932d0
2022-01-06 05:08:49 +00:00
James Mattis
2dc89ff07a Update to ConnectivityService to use utils am: 4ab1ffca29 am: 241bbaddf3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934218

Change-Id: I5cdadfa7d589e63013baf752d1dc752dfc9c3cc2
2022-01-06 04:49:48 +00:00
James Mattis
241bbaddf3 Update to ConnectivityService to use utils am: 4ab1ffca29
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934218

Change-Id: I7c7ad0a9e797ad6c279fe97c66211854d061dfea
2022-01-06 04:32:48 +00:00
Treehugger Robot
79e835cda3 Merge "[MS33.2] Remove NetdService dependency" am: ee7ca130dc am: ac65d203f0 am: 55180757fb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935969

Change-Id: I0ecaefff87cd61475f11052fd6b0c0f336c27f6e
2022-01-05 19:12:19 +00:00
lucaslin
355d3d1009 Caps callback should be called when underlying networks are changed am: 36faae95ba am: 0be0f9dc54 am: 6044b11a9c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1838424

Change-Id: Ib0a1c7e9357722d6fd7f3115f004d89e9ed13ee8
2022-01-05 19:10:12 +00:00
James Mattis
4ab1ffca29 Update to ConnectivityService to use utils
Update to ConnectivityService to use permission utils to validate the
existence of a system feature.

Bug: 210485380
Test: atest FrameworksNetTests:
com.android.server.ConnectivityServiceTest

Change-Id: Ia537cc5b37ef8d80f49f1a83ba572b3b8a9f6874
2022-01-05 09:15:24 -08: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
ad1615551e Merge "[MS25.2] Remove AppOpsManager.OP_GET_USAGE_STATS dependency" am: 90cf8dbd92 am: 86d23e7da9 am: 05ed2b9a6f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934184

Change-Id: I94ad676c862ff9527f56ca98d5343bd3d70b5a56
2022-01-03 23:35:49 +00: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
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