Lorenzo Colitti
f4aafb9513
Merge "bpf: don't offload IPv4 packets with TCP port 21 (ftp) and 1723 (pptp)" am: ad8fb7fce4 am: b6ea38e832 am: a5688238a0 am: 55910d25ab
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1802476
Change-Id: I0695be6472991aff841914f1080cb2d92f0e7a17
2021-08-20 04:30:24 +00:00
Lorenzo Colitti
55910d25ab
Merge "bpf: don't offload IPv4 packets with TCP port 21 (ftp) and 1723 (pptp)" am: ad8fb7fce4 am: b6ea38e832 am: a5688238a0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1802476
Change-Id: Ia021aac0d66a2fd450797bf296d9c6e282b7e91a
2021-08-20 04:15:47 +00:00
Lorenzo Colitti
a5688238a0
Merge "bpf: don't offload IPv4 packets with TCP port 21 (ftp) and 1723 (pptp)" am: ad8fb7fce4 am: b6ea38e832
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1802476
Change-Id: I3f16d6d1ccaac0ce0981ca56c638aab6a0c41103
2021-08-20 03:58:54 +00:00
Lorenzo Colitti
b6ea38e832
Merge "bpf: don't offload IPv4 packets with TCP port 21 (ftp) and 1723 (pptp)" am: ad8fb7fce4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1802476
Change-Id: I2ca694a0154b3043092890cfd272e7b86cca3fb5
2021-08-20 03:39:28 +00:00
Lorenzo Colitti
ad8fb7fce4
Merge "bpf: don't offload IPv4 packets with TCP port 21 (ftp) and 1723 (pptp)"
2021-08-20 03:24:09 +00:00
Hungming Chen
bc85178435
bpf: don't offload IPv4 packets with TCP port 21 (ftp) and 1723 (pptp)
...
Bypass the IPv4 TCP packets with port 21 (ftp) and 1723 (pptp) from
BPF offload because these packets need the netfilter conntrack helper.
Bug: 195914327
Test: manual test as the follows
1. Connect to ftp.slackware.com with port 21 in active mode.
2. Check the PORT command success.
Command: PORT 192,168,62,128,174,17
Response: 200 PORT command successful.
3. Download a file.
Change-Id: I8e3b8d9323eb0e572f20c74442b55d4ee95abc2f
2021-08-19 14:29:25 +00:00
Aaron Huang
3a1700492a
Merge "Bypass cellular battery stats test if telephony is not supported" am: 1c603e7ec3 am: d347dad799 am: 2a00b80275 am: 9b034defff
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796589
Change-Id: If5628d2529796fc6878f50c38b2fab8114628933
2021-08-19 06:37:40 +00:00
Aaron Huang
9b034defff
Merge "Bypass cellular battery stats test if telephony is not supported" am: 1c603e7ec3 am: d347dad799 am: 2a00b80275
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796589
Change-Id: If897470505f6baa44d70e6f3d2758d9ab2969bec
2021-08-19 06:20:39 +00:00
Aaron Huang
2a00b80275
Merge "Bypass cellular battery stats test if telephony is not supported" am: 1c603e7ec3 am: d347dad799
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796589
Change-Id: I96428c05cb74c533b83083e183f82714d20a46be
2021-08-19 06:07:19 +00:00
Aaron Huang
d347dad799
Merge "Bypass cellular battery stats test if telephony is not supported" am: 1c603e7ec3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796589
Change-Id: I2e10702cee72d81da0564fb29f5fcddc465775c9
2021-08-19 05:54:28 +00:00
Aaron Huang
1c603e7ec3
Merge "Bypass cellular battery stats test if telephony is not supported"
2021-08-19 05:37:59 +00:00
Aaron Huang
8790b6ccfb
[automerger skipped] Merge "Skip wifi stats test if link layer stats is not supported" am: cf79fcba3b -s ours am: 171905cb5f -s ours am: 771970a7ce -s ours am: f688a3f954 -s ours
...
am skip reason: Merged-In I592dd5f1d6e13b020beadb11b9d913857a82e524 with SHA-1 58b493abf6 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796372
Change-Id: Ia8bdd173ac3ffc012dd9229938eb1e86ea7f1cea
2021-08-19 04:13:17 +00:00
Aaron Huang
f688a3f954
[automerger skipped] Merge "Skip wifi stats test if link layer stats is not supported" am: cf79fcba3b -s ours am: 171905cb5f -s ours am: 771970a7ce -s ours
...
am skip reason: Merged-In I592dd5f1d6e13b020beadb11b9d913857a82e524 with SHA-1 58b493abf6 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796372
Change-Id: I196a6bfae7c235c37a70cb05278b905ae4b37cbd
2021-08-19 04:03:59 +00:00
Aaron Huang
771970a7ce
[automerger skipped] Merge "Skip wifi stats test if link layer stats is not supported" am: cf79fcba3b -s ours am: 171905cb5f -s ours
...
am skip reason: Merged-In I592dd5f1d6e13b020beadb11b9d913857a82e524 with SHA-1 58b493abf6 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796372
Change-Id: I76acb92e9174fcef2c48303f1de4d5e9c59c4948
2021-08-19 03:54:59 +00:00
Aaron Huang
171905cb5f
[automerger skipped] Merge "Skip wifi stats test if link layer stats is not supported" am: cf79fcba3b -s ours
...
am skip reason: Merged-In I592dd5f1d6e13b020beadb11b9d913857a82e524 with SHA-1 58b493abf6 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796372
Change-Id: Ie00207c8598911d6d4af814909bbd74ff209edc2
2021-08-19 03:36:54 +00:00
Aaron Huang
cf79fcba3b
Merge "Skip wifi stats test if link layer stats is not supported"
2021-08-19 03:23:22 +00:00
Xin Li
a67a56e1ff
[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: e534ce4c55 -s ours am: 2790b1fc6e -s ours am: 1ec252a4e5 -s ours
...
am skip reason: Merged-In I5a33f959c8ae5a34584f57508f392038e44062e7 with SHA-1 17bc178920 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15571816
Change-Id: I7b2e4c6e0df25b1a14f85843e0990b6bb52e6ccf
2021-08-17 20:32:54 +00:00
Xin Li
1ec252a4e5
[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: e534ce4c55 -s ours am: 2790b1fc6e -s ours
...
am skip reason: Merged-In I5a33f959c8ae5a34584f57508f392038e44062e7 with SHA-1 17bc178920 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15571816
Change-Id: I5a6eee741f083302c2734dadd83b8f4fb7d615b8
2021-08-17 19:46:49 +00:00
Xin Li
2790b1fc6e
[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: e534ce4c55 -s ours
...
am skip reason: Merged-In I5a33f959c8ae5a34584f57508f392038e44062e7 with SHA-1 17bc178920 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15571816
Change-Id: I08ecc56fd381455cbe952748dece0a00000dfc0c
2021-08-17 18:36:18 +00:00
Xin Li
e534ce4c55
Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master
2021-08-17 18:15:09 +00:00
Aaron Huang
1e49ed0e84
Bypass cellular battery stats test if telephony is not supported
...
This test requires a cell network so the test will be failed if
the device does not support telephony. Add a condition to check
if the device supports telephony and skip cellular battery stats
test if telephony is not supported.
Bug: 196231205
Test: atest CtsNetTestCases:BatteryStatsManagerTest
Change-Id: I9ddc1da2a3f83f3fd2ab59059185f2f7a8d08701
2021-08-17 07:13:16 +00:00
Aaron Huang
114a5b2fd3
Skip wifi stats test if link layer stats is not supported
...
Wifi link layer is an optional feature so this test will be
failed on wifi stats check if a device does not support it.
Add a check to know if the device supports wifi link layer
stats and skip it if it is not supported.
Bug: 195518957
Test: CtsNetTestCases:BatteryStatsManagerTest
Change-Id: I592dd5f1d6e13b020beadb11b9d913857a82e524
Merged-In: I592dd5f1d6e13b020beadb11b9d913857a82e524
2021-08-17 07:12:54 +00:00
Remi NGUYEN VAN
df5f85dab4
Merge "Fix NetworkCapabilities MTS on S, CTS on S+module" am: 7262180c07 am: 6180b47f92 am: 882c640caa am: b2123d25c6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796369
Change-Id: I9e33734d4bcad84c67d882f319ce904a18eaf719
2021-08-17 03:45:11 +00:00
Remi NGUYEN VAN
b2123d25c6
Merge "Fix NetworkCapabilities MTS on S, CTS on S+module" am: 7262180c07 am: 6180b47f92 am: 882c640caa
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796369
Change-Id: I65e8c1c6c99ad7d34d1c934afd31392ed275fb6a
2021-08-17 03:25:55 +00:00
Remi NGUYEN VAN
882c640caa
Merge "Fix NetworkCapabilities MTS on S, CTS on S+module" am: 7262180c07 am: 6180b47f92
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796369
Change-Id: Id02a4659d9e27a6fffc075cdaac878c94a436f42
2021-08-17 03:08:16 +00:00
Remi NGUYEN VAN
6180b47f92
Merge "Fix NetworkCapabilities MTS on S, CTS on S+module" am: 7262180c07
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796369
Change-Id: Id701a83c714eba3d8f56401c6bb8c91a02687d27
2021-08-17 02:54:25 +00:00
Remi NGUYEN VAN
7262180c07
Merge "Fix NetworkCapabilities MTS on S, CTS on S+module"
2021-08-17 02:34:44 +00:00
Treehugger Robot
4c9f6a1798
Merge "Add a unit test for a bug in registerDefaultNetworkCallback." am: b8178678df am: eabf1851e8 am: 0c0b45e6b5 am: 0ceaf95f24
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796367
Change-Id: I346228233bac4986f08bd077abb135a3dd738e06
2021-08-17 02:21:41 +00:00
Treehugger Robot
0ceaf95f24
Merge "Add a unit test for a bug in registerDefaultNetworkCallback." am: b8178678df am: eabf1851e8 am: 0c0b45e6b5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796367
Change-Id: Ie945ff1b93650a7f7575f03516855d890104c323
2021-08-17 02:13:14 +00:00
Treehugger Robot
0c0b45e6b5
Merge "Add a unit test for a bug in registerDefaultNetworkCallback." am: b8178678df am: eabf1851e8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796367
Change-Id: I659d9d2c079cb01081e7996e0ee4f081c81c9a9c
2021-08-17 02:00:48 +00:00
Treehugger Robot
eabf1851e8
Merge "Add a unit test for a bug in registerDefaultNetworkCallback." am: b8178678df
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796367
Change-Id: I409ec9838a208647604d8975135bb408ae54c575
2021-08-17 01:47:05 +00:00
Treehugger Robot
b8178678df
Merge "Add a unit test for a bug in registerDefaultNetworkCallback."
2021-08-17 01:32:39 +00:00
Lorenzo Colitti
bbadec37d2
Add a unit test for a bug in registerDefaultNetworkCallback.
...
Currently, when a VPN app calls registerDefaultNetworkCallback,
it will always get its own VPN, even if the VPN app called
VpnService.Builder#addDisallowedApplication to take itself out
of the VPN's UID ranges.
Add a test for the current incorrect behaviour.
Also fix an indentation error elsewhere.
Bug: 195265065
Test: test-only change
Change-Id: Id9648ea71fc7ae10855aa311beeb7975569d17f2
2021-08-17 01:36:54 +09:00
Treehugger Robot
4b408eee1b
Merge "Fix ConnectivityDiagnosticsManagerTest for MTS" am: 3d45c4e432 am: 56ee46f814 am: 3d75600716 am: b2f8a7ac13
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793509
Change-Id: Ic0e65770ad38b0654abf9875d7fd3eaae44f1b8e
2021-08-16 11:36:14 +00:00
Treehugger Robot
b2f8a7ac13
Merge "Fix ConnectivityDiagnosticsManagerTest for MTS" am: 3d45c4e432 am: 56ee46f814 am: 3d75600716
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793509
Change-Id: Iec27e6bfc1a866eb2489500a4d1d437e78f431a3
2021-08-16 11:23:39 +00:00
Treehugger Robot
3d75600716
Merge "Fix ConnectivityDiagnosticsManagerTest for MTS" am: 3d45c4e432 am: 56ee46f814
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793509
Change-Id: If83395a7cab0e3e2f5107ae7ba8839a8022b068e
2021-08-16 11:10:27 +00:00
Treehugger Robot
56ee46f814
Merge "Fix ConnectivityDiagnosticsManagerTest for MTS" am: 3d45c4e432
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793509
Change-Id: I18e5cc4fc8f5174682164911844d9d961948f937
2021-08-16 11:00:54 +00:00
Treehugger Robot
3d45c4e432
Merge "Fix ConnectivityDiagnosticsManagerTest for MTS"
2021-08-16 10:51:19 +00:00
Treehugger Robot
631acdeff0
Merge "Fix a flake in ConnectivityDiagnostics" am: 1ac3e27399 am: 79b4f30495 am: 4fbdc30d3e am: 3811b0eef4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796368
Change-Id: I51b1ae7e12b92aa3eda4ab3b5cb68f1a68929a75
2021-08-16 10:04:54 +00:00
Treehugger Robot
3811b0eef4
Merge "Fix a flake in ConnectivityDiagnostics" am: 1ac3e27399 am: 79b4f30495 am: 4fbdc30d3e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796368
Change-Id: I4391c805185500b93026ec2095dc7f3f971f5775
2021-08-16 09:46:22 +00:00
Treehugger Robot
4fbdc30d3e
Merge "Fix a flake in ConnectivityDiagnostics" am: 1ac3e27399 am: 79b4f30495
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796368
Change-Id: Ie4a7bd523342c93ca426305153ad8cc312346cae
2021-08-16 09:29:59 +00:00
Treehugger Robot
79b4f30495
Merge "Fix a flake in ConnectivityDiagnostics" am: 1ac3e27399
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1796368
Change-Id: If68391d8131cb0d64fe7bfcfdea192fadc24d1cf
2021-08-16 09:12:48 +00:00
Remi NGUYEN VAN
5b8e2e9935
Fix NetworkCapabilities MTS on S, CTS on S+module
...
restrictCapabilitiesForTestNetwork was renamed after S release to be
included in a mainline release, but this causes the MTS test to fail on
S if the Connectivity module is not updated, and CTS to fail if the
connectivity module is updated.
Mark the test as @ConnectivityModuleTest so it can be skipped on
non-connectivity module MTS tests (such as NetworkStack tests), and add
back the previous method name to keep CTS passing.
Bug: 196755836
Test: atest NetworkCapabilitiesTest
Change-Id: Ibd6c2e62e5949ec6d93e9f6e4fc05129c29b94f8
2021-08-16 18:03:37 +09:00
Treehugger Robot
1ac3e27399
Merge "Fix a flake in ConnectivityDiagnostics"
2021-08-16 09:01:58 +00:00
Treehugger Robot
4d2364a41b
[automerger skipped] Merge "Remove unused directories in Connectivity" am: 381ea1f1b1 am: 48181ab964 -s ours am: 770721c281 -s ours am: a607c4b4f6 -s ours
...
am skip reason: Merged-In Ie3a058b904cb2e3704c3a0725c8f720f81bb235e with SHA-1 f9e7c2a543 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793470
Change-Id: I31dbfb3772cf319a3a463f8f223de78cb0e852de
2021-08-16 07:30:43 +00:00
Treehugger Robot
a607c4b4f6
[automerger skipped] Merge "Remove unused directories in Connectivity" am: 381ea1f1b1 am: 48181ab964 -s ours am: 770721c281 -s ours
...
am skip reason: Merged-In Ie3a058b904cb2e3704c3a0725c8f720f81bb235e with SHA-1 f9e7c2a543 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793470
Change-Id: I25f95127fdc64fb5ee9919447c93472699004c50
2021-08-16 07:21:46 +00:00
Treehugger Robot
770721c281
[automerger skipped] Merge "Remove unused directories in Connectivity" am: 381ea1f1b1 am: 48181ab964 -s ours
...
am skip reason: Merged-In Ie3a058b904cb2e3704c3a0725c8f720f81bb235e with SHA-1 f9e7c2a543 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793470
Change-Id: Icc5c2a37af69449393a7cc7093823c90efb1766c
2021-08-16 07:11:53 +00:00
Chalard Jean
4da146bd2f
Fix a flake in ConnectivityDiagnostics
...
Bug: none
Test: ConnectivityServiceTest
Change-Id: I9242226be976e7c346addcbaf7e2b0154a3829f7
2021-08-16 16:05:06 +09:00
Treehugger Robot
48181ab964
Merge "Remove unused directories in Connectivity" am: 381ea1f1b1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793470
Change-Id: I2d9d147016b4fc4060a4b04b75a4a00c10876847
2021-08-16 06:57:16 +00:00
Treehugger Robot
381ea1f1b1
Merge "Remove unused directories in Connectivity"
2021-08-16 06:43:07 +00:00