Commit Graph

4070 Commits

Author SHA1 Message Date
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
3763316aeb Merge "Add the fixed test case back into presubmit" 2021-12-27 10:02:52 +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
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
fbe500351e Merge "Add enterpriseSpecifier" 2021-12-23 22:25:20 +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
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
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
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
Junyu Lai
2e158b9229 Merge "[MS15.2] Move SUBSCRIBER_ID_MATCH_RULE_* constants to static lib" am: 78d36d7653 am: 6e952001f8 am: e30e727a57
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930824

Change-Id: I6c64d586daffeb1fd226dabd238ea8b2cfca5b4d
2021-12-23 02:17:03 +00:00
Junyu Lai
78d36d7653 Merge "[MS15.2] Move SUBSCRIBER_ID_MATCH_RULE_* constants to static lib" 2021-12-23 01:35:00 +00:00
Frank Li
32bde18ab2 Merge "[DU02]Remove DevicePolicyManagerInternal from NetworkStatsAccess" am: bacbe802c1 am: 6f9dbdb13a am: 0f96c5d627
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1925684

Change-Id: Ib7fa09e37b46cc7d3fdd5b2c37cc7afd95ff68cc
2021-12-22 15:05:17 +00:00
Frank Li
bacbe802c1 Merge "[DU02]Remove DevicePolicyManagerInternal from NetworkStatsAccess" 2021-12-22 14:13:55 +00:00
Chiachang Wang
76df50c9db Dump target sdk version for ConnectivityCoverageTests into 31
Address TODO since 31 is available now

Test: atest ConnectivityCoverageTests
Change-Id: I40618bd4a3d8b314bf0ed7c75cd15f48439c5520
2021-12-22 17:47:26 +08:00
Junyu Lai
07c772cf49 [MS15.2] Move SUBSCRIBER_ID_MATCH_RULE_* constants to static lib
Subscriber Id Match Rules won't be exposed as system Api.
Any caller who references NetworkTemplate#SUBSCRIBER_ID_MATCH_RULE_*
should use the one in NetworkStatsUtils instead.
And remove the need of the constants as soon as possible.

Test: atest NetworkPolicyManagerServiceTest \
      FrameworksNetTests
Bug: 204830222
Change-Id: I363a4440f85f1ca818eaf1125e45b141dd6f0e55
2021-12-22 09:41:29 +00:00
Jack Yu
aef2883f44 Added a new network capability MMTEL am: 04bbc5b9b0 am: c98051396a am: 69f3375c30
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930920

Change-Id: I5b95957f95dc05fca7c5f77de9ad16a5d3f86f23
2021-12-22 09:39:13 +00:00
lucaslin
f76481568d 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-22 07:03:31 +00:00
Chiachang Wang
cd700e4864 Add the fixed test case back into presubmit
testRegisterCallbackWithCarrierPrivileges was marked as
SkipPresubmit. The bug is expected to be fixed, so add the
test back into presubmit.

Test: atest android.net.cts.ConnectivityDiagnosticsManagerTest
Bug: 159718782
Change-Id: Ic7dc050de0d9f03f0e157927928b4c45f76fe2d7
2021-12-22 06:59:25 +00:00
Jack Yu
04bbc5b9b0 Added a new network capability MMTEL
Added NET_CAPABILITY_MMTEL to indicate a network
support MMTEL (Multimedia telephony). This is for
IMS service to request an IMS network that supports
voice or PS (VoPS for 4G, VoNR for 5G).

This was previously submitted as aosp/1927841, but
which got reverted due to breaking the mainline
build, which uses the pre-built module.

Bug: 210774375
Test: atest ConnectivityServiceTest
Change-Id: If8b691ff4999a4dbf54e7567d9ca74d743dc5ded
2021-12-21 16:31:30 +00:00
lifr
5f66ddac71 [DU02]Remove DevicePolicyManagerInternal from NetworkStatsAccess
NetworkStatsAccess is using DevicePolicyManagerInternal APIs, which
cannot be accessed after moving into the mainline module. So, replace
and remove those hidden API usages.

Bug: 207100745
Test: atest NetworkStatsAccessTest
Change-Id: I0430ed2c47e5a695206cb660e3971ddab6c467dd
2021-12-21 23:45:28 +08:00
Treehugger Robot
8df99de1be Merge "[MS12.2] Add unit test for NetworkTemplate builder" am: 05e12e6f79 am: f5c2f797da am: 9aa4bedc7b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1928058

Change-Id: I2a52227b981ef2da7387b5184bbd882776264a46
2021-12-21 15:40:12 +00:00
Treehugger Robot
05e12e6f79 Merge "[MS12.2] Add unit test for NetworkTemplate builder" 2021-12-21 15:09:43 +00:00
Jean Chalard
5c4ffb5c36 Merge "Improve error reporting in ConnDiags tests" am: 01aa602a3f am: 78a9b27ca5 am: 252558dcdd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1925681

Change-Id: I408e0d129604a3460bdd2fc2726c2e60d152edd7
2021-12-21 13:37:28 +00:00
Jean Chalard
01aa602a3f Merge "Improve error reporting in ConnDiags tests" 2021-12-21 12:48:16 +00:00
Martijn Coenen
27c4f5b400 Merge "Revert "Added a new network capability MMTEL"" am: e5b150a3cd am: 5611484dc1 am: 92ad6580af
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1928149

Change-Id: I25faa69306e474d025bdb94419dfcc86e1728efe
2021-12-21 12:09:18 +00:00
Treehugger Robot
0902b55cf5 Merge "Added a new network capability MMTEL" am: 95d180b5bf am: a28c684662 am: f8ead572a1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927841

Change-Id: Idb64a787afa8bdbd49c7a319238b6e45553c93b6
2021-12-21 12:08:18 +00:00
Martijn Coenen
e5b150a3cd Merge "Revert "Added a new network capability MMTEL"" 2021-12-21 11:27:16 +00:00
Martijn Coenen
6ebc8ba595 Revert "Added a new network capability MMTEL"
Revert "Added setup/tear down data support"

Revert "Added a new network capability MMTEL"

Revert submission 1927643-mmtel_capability

Reason for revert: b/211586152
Reverted Changes:
Ifea8b1e40:Added a new network capability MMTEL
I38655bef2:Added a new network capability MMTEL
I837606d9e:Added setup/tear down data support
I2c7b291fe:Added a new network capability MMTEL

Change-Id: Ie9b0b0d9017ef8aea7fbb56dda522e7c433144b9
2021-12-21 11:24:01 +00:00
Treehugger Robot
95d180b5bf Merge "Added a new network capability MMTEL" 2021-12-21 10:42:37 +00:00
Junyu Lai
00a8897e98 [MS12.2] Add unit test for NetworkTemplate builder
Test: atest NetworkTemplateTest
Bug: 204830222
Change-Id: Ie83cd4322418449980bece7e13d68f2cacbaf1ef
2021-12-21 03:26:04 +00:00
Junyu Lai
0578623176 Merge "[MS10.2] Move multiplySafeByRational to NetworkStatsUtils" am: c6f89d4832 am: c407c3315f am: 2840adf26f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919247

Change-Id: Ic776001582760a04efb631616c130bf4260e4b9a
2021-12-21 01:51:07 +00:00
Junyu Lai
c6f89d4832 Merge "[MS10.2] Move multiplySafeByRational to NetworkStatsUtils" 2021-12-21 01:22:14 +00:00
Chalard Jean
5b2f852fcf Improve error reporting in ConnDiags tests
If an exception is thrown before the callback is registered,
the finally{} block will fail with an exception explaining
the callback can't be unregistered. This masks the actual
exception.

This will ensure the original exception is printed instead.

Test: ConnectivityDiagnosticsManagerTest
Change-Id: I38aba86ff6d5d2a2a8a27c389feffd3aab788774
2021-12-20 22:40:18 +09:00
Junyu Lai
b3e62b8d1d [MS10.2] Move multiplySafeByRational to NetworkStatsUtils
Test: atest NetworkStaticLibTests:com.android.net.moduletests.util.NetworkStatsUtilsTest
Bug: 204830222
Change-Id: Ib2464bd7607c7ef35fed780fccbc745b565a908c
2021-12-20 09:10:50 +00:00
Taras Antoshchuk
3bbbffe133 Revert "Revert "Unhide IpPrefix(InetAddress, int)""
This reverts commit 758ead6dd3.

Reason for revert: Re-landing changes not related to postsubmit failure

Change-Id: I2f705549d85af4ba45dc294e0a86d757490b1cd7
2021-12-19 11:54:56 +00:00
Taras Antoshchuk
2b3d62f3e9 Revert "Revert "Unhide RouteInfo#getType and related fields""
This reverts commit 6d1ea2bb16.

Reason for revert: Re-landing changes not related to postsubmit failure

Change-Id: If7940801518be5ddec91270b3663ddfc8b42eadb
2021-12-19 11:51:39 +00:00
Treehugger Robot
e48a86422a Merge "Rename libbpf to libbpf_bcc" am: e44ea016e1 am: 7bf5e61c37 am: 05d00b50fd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1906032

Change-Id: Ia0bba1c182fe43b01126e88f86f97c9c09163e59
2021-12-17 01:30:27 +00:00
Treehugger Robot
e44ea016e1 Merge "Rename libbpf to libbpf_bcc" 2021-12-17 00:37:05 +00:00
Jack Yu
f322d4f5e0 Added a new network capability MMTEL
Added NET_CAPABILITY_MMTEL to indicate a network
support MMTEL (Multimedia telephony). This is for
IMS service to request an IMS network that supports
voice or PS (VoPS for 4G, VoNR for 5G).

Bug: 210774375
Test: atest ConnectivityServiceTest
Change-Id: Ifea8b1e40f65c610e925a27be873930fee2df693
2021-12-16 14:38:10 -08:00
Treehugger Robot
b6178a4fe5 Merge "Genericize NC#hasSameUids" am: a0d5980011 am: 0c479d5f82 am: c063140c7a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919250

Change-Id: If2185ff886891d57c22ed2f6325f6188cb3dd7d9
2021-12-16 16:31:17 +00:00