Commit Graph

46066 Commits

Author SHA1 Message Date
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
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
Taras Antoshchuk
4d9ea21739 Merge "Revert "Revert "Unhide IpPrefix(InetAddress, int)""" am: 37ff6df023 am: f10c9f28c2 am: a24a5bebf0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927439

Change-Id: Icb5050d3370b1c8c4e94bd3d21bafa36201da883
2021-12-23 13:49:07 +00:00
Taras Antoshchuk
0f8ebc3d38 Merge "Revert "Revert "Unhide RouteInfo#getType and related fields""" am: 839cb2692e am: 899a350e40 am: fac2b9568c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927438

Change-Id: I09f3f9eb3e88846d505182a106a6f44732cb40ab
2021-12-23 13:49:02 +00:00
Taras Antoshchuk
a24a5bebf0 Merge "Revert "Revert "Unhide IpPrefix(InetAddress, int)""" am: 37ff6df023 am: f10c9f28c2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927439

Change-Id: I25b8bee2b37f0e1fc223f20e80c9025ba08b9937
2021-12-23 13:33:50 +00:00
Taras Antoshchuk
fac2b9568c Merge "Revert "Revert "Unhide RouteInfo#getType and related fields""" am: 839cb2692e am: 899a350e40
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927438

Change-Id: Ia98395e53b403aca330542b8f5360452a36d1625
2021-12-23 13:33:47 +00:00
Taras Antoshchuk
f10c9f28c2 Merge "Revert "Revert "Unhide IpPrefix(InetAddress, int)""" am: 37ff6df023
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927439

Change-Id: Ide524a4a22ca42bfa9a48b6144d061781452c69d
2021-12-23 13:16:09 +00:00
Taras Antoshchuk
899a350e40 Merge "Revert "Revert "Unhide RouteInfo#getType and related fields""" am: 839cb2692e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927438

Change-Id: I2dbb8d3e4ce19910700a718ec4546062a0dff770
2021-12-23 13:16:08 +00:00
Lucas Lin
7db5f91856 [conflict] 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
2021-12-23 13:13:29 +00:00
Taras Antoshchuk
37ff6df023 Merge "Revert "Revert "Unhide IpPrefix(InetAddress, int)""" 2021-12-23 12:41:23 +00:00
Taras Antoshchuk
839cb2692e Merge "Revert "Revert "Unhide RouteInfo#getType and related fields""" 2021-12-23 12:41:23 +00:00
Lucas Lin
66737a8c5d Merge "Add test for Vpn#prepare()" into sc-dev am: f89a629776
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15606164

Change-Id: I6b9024a183cefba4ce7173650d78c61ee60c9ec2
2021-12-23 12:32:09 +00:00
Lucas Lin
f89a629776 Merge "Add test for Vpn#prepare()" into sc-dev 2021-12-23 12:14:46 +00:00
Lucas Lin
a38701c7fa Merge "Add test for Vpn#prepare()" into sc-v2-dev-plus-aosp 2021-12-23 11:20:45 +00:00
lucaslin
c01630e963 Add test for Vpn#prepare()
Add test for Vpn#prepare() to check if the SecurityException will
be thrown when the caller is not the SYSTEM_UID and doesn't have
CONTROL_VPN permission and its package doesn't match the oldPackage
or the newPackage.

Ignore-AOSP-First: It's a part of security patches.
Bug: 191276656
Test: atest FrameworksNetTests:VpnTest
Change-Id: Ibe0b245561b00442a6377fb849603f8b9026e9c4
Merged-In: Ibe0b245561b00442a6377fb849603f8b9026e9c4
2021-12-23 06:53:18 +00:00
markchien
8fb75e3916 Add bpf jni into connectivity module
This is the preparing CL for connectivity module to use bpf.

Bug: 179733303
Bug: 205088391
Test: atest ConnectivityCoverageTests
Change-Id: Ibe49d7f671b5050461e2c63c080d9457ad76c26c
2021-12-23 14:33:01 +08:00
Treehugger Robot
231485f7f0 Merge "Support testing upload/download packets" am: 139f43509e am: 911bd90d33 am: 8d8cf85d5c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1903463

Change-Id: I1664ffa4b8a3ecdfc7177c198636cafb13548b24
2021-12-23 05:22:42 +00:00
Treehugger Robot
8d8cf85d5c Merge "Support testing upload/download packets" am: 139f43509e am: 911bd90d33
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1903463

Change-Id: Ic70913ef89cf1474a7dcf68636312521a99a845b
2021-12-23 04:56:11 +00:00
TreeHugger Robot
40f9455d6d Merge "Dexopt service-connectivity." into stage-aosp-master am: 78a1e45e95 am: 7d1f3e501f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16521718

Change-Id: I875edcd01e6e6ae43d60f3000c9a523a0710cae5
2021-12-23 04:42:16 +00:00
Treehugger Robot
911bd90d33 Merge "Support testing upload/download packets" am: 139f43509e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1903463

Change-Id: Id4a29a813ad2641936a0a7c721f40faea198c5f1
2021-12-23 04:39:02 +00:00
TreeHugger Robot
7d1f3e501f Merge "Dexopt service-connectivity." into stage-aosp-master am: 78a1e45e95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16521718

Change-Id: If75758c3134799baca694d133777454e9af0206f
2021-12-23 04:32:56 +00:00