LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,988 Commits 2 Branches 0 Tags
8df99de1bedacfca44c318419ccd92b03d9f367e
Commit Graph

4037 Commits

Author SHA1 Message Date
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
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
Ayush Sharma
28f657852b Merge changes from topic "revert-1551943-vpn-impl-FKOLCXTDDT" am: e89170bcb1 am: 23756bef7d am: 626bac0e8c 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927304

Change-Id: I6d85fbc0dc9d9cf9bddebb756d28531fb35e2921
 2021-12-16 15:52:44 +00:00
Ayush Sharma
3b9f2fcc8c Revert "Unhide IpPrefix(InetAddress, int)" am: 758ead6dd3 am: ea0caefdd2 am: 6c75679f1d 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927303

Change-Id: I2c5800b1850917dcf573e0456b80734b847689c2
 2021-12-16 15:52:42 +00:00
Ayush Sharma
a5b1376b1a Revert "Add CTS tests for exclude VPN routes APIs" am: f4882153ed am: bf8d513fda am: 2623bb352e 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927302

Change-Id: I81f1ae63aa32ead0eb5d0b3b65fd21e4ad07ab28
 2021-12-16 15:52:37 +00:00
Treehugger Robot
a0d5980011 Merge "Genericize NC#hasSameUids" 2021-12-16 15:37:06 +00:00
Ayush Sharma
ea0caefdd2 Revert "Unhide IpPrefix(InetAddress, int)" am: 758ead6dd3 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927303

Change-Id: If3840f48333e48895701b12f201e34166e3a3136
 2021-12-16 15:16:53 +00:00
Ayush Sharma
bf8d513fda Revert "Add CTS tests for exclude VPN routes APIs" am: f4882153ed 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927302

Change-Id: Id9904952c064d9bd25aa21121a3ed46af9ad7983
 2021-12-16 15:16:50 +00:00
Ayush Sharma
e89170bcb1 Merge changes from topic "revert-1551943-vpn-impl-FKOLCXTDDT" 
* changes:
  Revert "Unhide RouteInfo#getType and related fields"
  Revert "Unhide IpPrefix(InetAddress, int)"
  Revert "Add CTS tests for exclude VPN routes APIs"
 2021-12-16 15:01:30 +00:00
Ayush Sharma
758ead6dd3 Revert "Unhide IpPrefix(InetAddress, int)" 
Revert "Add APIs that allow to exclude routes from VPN"

Revert "Suppress NewApi warnings for @SystemApi -> public APIs"

Revert "Add VpnServiceBuilderShim for VpnService.Builder"

Revert submission 1551943-vpn-impl

Reason for revert: <DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=mainline_modules_x86_64-userdebug&lkgb=8007224&lkbb=8008168&fkbb=8007902 >, bug b/210979001
Reverted Changes:
I0e7aa077a:Add VpnServiceBuilderShim for VpnService.Builder
Ib12f5ab39:Suppress NewApi warnings for @SystemApi -> public ...
I59b9185cf:Unhide RouteInfo#getType and related fields
Ie5b62b2b2:Unhide IpPrefix(InetAddress, int)
I993a32d40:Add CTS tests for exclude VPN routes APIs
Ib24b2d3fb:Suppress NewApi warnings for @SystemApi -> public ...
Ic3b10464a:Add APIs that allow to exclude routes from VPN

Change-Id: Id0c373fb042a98c1c68807acf7fcfe456520ebe2
BUG: 210979001
 2021-12-16 14:40:13 +00:00
Ayush Sharma
f4882153ed Revert "Add CTS tests for exclude VPN routes APIs" 
Revert "Add APIs that allow to exclude routes from VPN"

Revert "Suppress NewApi warnings for @SystemApi -> public APIs"

Revert "Add VpnServiceBuilderShim for VpnService.Builder"

Revert submission 1551943-vpn-impl

Reason for revert: <DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=mainline_modules_x86_64-userdebug&lkgb=8007224&lkbb=8008168&fkbb=8007902 >, bug b/210979001
Reverted Changes:
I0e7aa077a:Add VpnServiceBuilderShim for VpnService.Builder
Ib12f5ab39:Suppress NewApi warnings for @SystemApi -> public ...
I59b9185cf:Unhide RouteInfo#getType and related fields
Ie5b62b2b2:Unhide IpPrefix(InetAddress, int)
I993a32d40:Add CTS tests for exclude VPN routes APIs
Ib24b2d3fb:Suppress NewApi warnings for @SystemApi -> public ...
Ic3b10464a:Add APIs that allow to exclude routes from VPN

Change-Id: Ic4f86f405c395f1356de1a6f8cf9e92692d953ce
BUG: 210979001
 2021-12-16 14:40:13 +00:00
Ayush Sharma
6d1ea2bb16 Revert "Unhide RouteInfo#getType and related fields" 
Revert "Add APIs that allow to exclude routes from VPN"

Revert "Suppress NewApi warnings for @SystemApi -> public APIs"

Revert "Add VpnServiceBuilderShim for VpnService.Builder"

Revert submission 1551943-vpn-impl

Reason for revert: <DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=mainline_modules_x86_64-userdebug&lkgb=8007224&lkbb=8008168&fkbb=8007902 >, bug b/210979001
Reverted Changes:
I0e7aa077a:Add VpnServiceBuilderShim for VpnService.Builder
Ib12f5ab39:Suppress NewApi warnings for @SystemApi -> public ...
I59b9185cf:Unhide RouteInfo#getType and related fields
Ie5b62b2b2:Unhide IpPrefix(InetAddress, int)
I993a32d40:Add CTS tests for exclude VPN routes APIs
Ib24b2d3fb:Suppress NewApi warnings for @SystemApi -> public ...
Ic3b10464a:Add APIs that allow to exclude routes from VPN

Change-Id: I98d3b998e4702f56e9d5e17944238b283b29f2b2
BUG: 210979001
 2021-12-16 14:40:13 +00:00
Chalard Jean
f4802fa4c2 Genericize NC#hasSameUids 
This will be used by another set of UIDs in a future patch

Test: FrameworksNetTests
Change-Id: I2c5d18ef93e73b702723814592ef3f3baf5dfbc4
 2021-12-16 23:03:42 +09:00
Aaron Huang
767e59c01b Merge "Add makeDependencies method in IpSecService related tests" am: 3c1e7398a4 am: c6b730ce81 am: 1bf71ba427 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1904464

Change-Id: I8598dd981e5efab1153e0b2068db45e8e2ee5510
 2021-12-16 13:22:00 +00:00
Aaron Huang
3c1e7398a4 Merge "Add makeDependencies method in IpSecService related tests" 2021-12-16 12:32:41 +00:00
Taras Antoshchuk
89bb3ff718 Merge changes from topic "vpn-impl" am: 8be6ba36dc am: e0895f355a am: a44507ec2b 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1551943

Change-Id: I42b02315fdcc62704d8f92f3bc7bf462dc5b9edf
 2021-12-16 12:04:31 +00:00
Taras Antoshchuk
3c54cc1c9f Unhide IpPrefix(InetAddress, int) am: a5a1b80222 am: 6cf24035ca am: 21e769376b 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1831813

Change-Id: Ie4953b68049f45cee2f1097e890f6c7fbb5b99a8
 2021-12-16 12:04:28 +00:00
Taras Antoshchuk
cf34e56459 Unhide RouteInfo#getType and related fields am: 62065db8d1 am: d44b6b9629 am: b8187e3b4a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784543

Change-Id: I39470864beda342f04b6729d3e2222c8da9215ba
 2021-12-16 12:04:23 +00:00
Taras Antoshchuk
6cf24035ca Unhide IpPrefix(InetAddress, int) am: a5a1b80222 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1831813

Change-Id: I0f0cfe71d555249e08e4a3946295fd028864c323
 2021-12-16 11:34:50 +00:00
Taras Antoshchuk
d44b6b9629 Unhide RouteInfo#getType and related fields am: 62065db8d1 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784543

Change-Id: I2af963e9918ae08e31bce57283cf3fefdb64c3a7
 2021-12-16 11:34:49 +00:00
Taras Antoshchuk
8be6ba36dc Merge changes from topic "vpn-impl" 
* changes:
  Add CTS tests for exclude VPN routes APIs
  Unhide IpPrefix(InetAddress, int)
  Unhide RouteInfo#getType and related fields
 2021-12-16 11:13:33 +00:00
Aaron Huang
70e3b16dcf Merge "Change to use Dependencies in IpSecService Tests" am: 286c0e5336 am: 90f307450c am: e4d6a01bcd 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1904463

Change-Id: Ic7621cd1ae8faaab4021d33e42ccc2d9c4237c9b
 2021-12-15 08:51:23 +00:00
Aaron Huang
286c0e5336 Merge "Change to use Dependencies in IpSecService Tests" 2021-12-15 07:53:23 +00:00
Xin Li
93c578c7ca Merge "Merge Android 12 QPR1" 2021-12-14 20:27:32 +00:00
Xin Li
06e662f597 Merge Android 12 QPR1 
Bug: 210511427
Merged-In: I4bfb3fc34f10d0c84dafc949f4e7f604d98244e1
Change-Id: I9ff07a2256a709115a3d84370cfcd5fadc34b3a9
 2021-12-14 08:39:15 -08:00
Remi NGUYEN VAN
4d44c36ed6 Merge "Move TestableNetworkAgent to Common Util Location" am: eef1e2033d am: d71552978c am: 7bf5e7e325 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1908520

Change-Id: I19e75581c18901eef23d4dd50ec62bbc6a8f66da
 2021-12-14 13:37:47 +00:00
Remi NGUYEN VAN
d71552978c Merge "Move TestableNetworkAgent to Common Util Location" am: eef1e2033d 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1908520

Change-Id: I7f95f6a3d4750e4dfef2ec4e61db1837661f119d
 2021-12-14 13:09:19 +00:00
Remi NGUYEN VAN
eef1e2033d Merge "Move TestableNetworkAgent to Common Util Location" 2021-12-14 12:49:15 +00:00
Jean Chalard
4c06947fce Merge "Remove NetworkCapabilities#combine*" am: 5469fa6e59 am: d5c9c3f4ae am: ad1cd95c10 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919248

Change-Id: I58462f6d0303803ffd43333b67865c57edef39a3
 2021-12-14 11:46:08 +00:00
Jean Chalard
d5c9c3f4ae Merge "Remove NetworkCapabilities#combine*" am: 5469fa6e59 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919248

Change-Id: I4b385d93b24ea85240dde589b2357543fb80c122
 2021-12-14 11:14:57 +00:00
Jean Chalard
5469fa6e59 Merge "Remove NetworkCapabilities#combine*" 2021-12-14 10:47:31 +00:00
Aswin Sankar
ce0fdcb616 DnsException: run only on T+ versions am: 5d16f41639 am: cef564eb4f am: 1b29dd3d2b 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1921304

Change-Id: Ib1efecd41c6fa5fea46b1c443027f09bcd8353a8
 2021-12-14 05:00:54 +00:00
Aswin Sankar
cef564eb4f DnsException: run only on T+ versions am: 5d16f41639 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1921304

Change-Id: I81b7420a00fd8a0cce81db0e07dd76e0a9d6313c
 2021-12-14 04:29:38 +00:00
Aswin Sankar
5d16f41639 DnsException: run only on T+ versions 
- Test was failing on S mainline builds. Fixing forward.

Bug: 210540375
Test: CtsDnsResolverTests.
Change-Id: Ia980965c8ee1b9ddae99f593628f8b7ecfeca394
 2021-12-14 02:44:54 +00:00