Commit Graph

43612 Commits

Author SHA1 Message Date
Treehugger Robot
ba47beef27 [automerger skipped] Merge "Dexopt service-connectivity." am: 42fb8d0703 -s ours am: 23404d4aa3 -s ours
am skip reason: Merged-In I9a009493fe0482967ab1f92516514715cfd457d6 with SHA-1 e0a64bb50c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1925682

Change-Id: Ifd93c4b83a126d719d6d0a46c4871633d354e18f
2021-12-22 13:43:01 +00:00
Treehugger Robot
23404d4aa3 [automerger skipped] Merge "Dexopt service-connectivity." am: 42fb8d0703 -s ours
am skip reason: Merged-In I9a009493fe0482967ab1f92516514715cfd457d6 with SHA-1 e0a64bb50c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1925682

Change-Id: I04b1f5155a0b497e1516fe6f951193cbb524c324
2021-12-22 13:31:07 +00:00
Treehugger Robot
42fb8d0703 Merge "Dexopt service-connectivity." 2021-12-22 13:10:21 +00:00
Jack Yu
69f3375c30 Added a new network capability MMTEL am: 04bbc5b9b0 am: c98051396a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930920

Change-Id: If5589107004cfd2296b2fe32c2cf3d8571b52243
2021-12-22 09:24:10 +00:00
Jack Yu
c98051396a Added a new network capability MMTEL am: 04bbc5b9b0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930920

Change-Id: I4d9496ac395cf59c62c1a3d6307b8d859aa08216
2021-12-22 09:05:42 +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
Treehugger Robot
9aa4bedc7b Merge "[MS12.2] Add unit test for NetworkTemplate builder" am: 05e12e6f79 am: f5c2f797da
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1928058

Change-Id: Idec041d83102f455f8ecab399c0596b7c401877a
2021-12-21 15:27:56 +00:00
Treehugger Robot
f5c2f797da Merge "[MS12.2] Add unit test for NetworkTemplate builder" am: 05e12e6f79
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1928058

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

Change-Id: If7b0f2d76154c20de8010efcda2a7731a1976be2
2021-12-21 13:19:32 +00:00
Jean Chalard
78a9b27ca5 Merge "Improve error reporting in ConnDiags tests" am: 01aa602a3f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1925681

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

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

Change-Id: I94bd175835477dd8f85850f3b7695fe639546e6f
2021-12-21 11:41:04 +00:00
Martijn Coenen
5611484dc1 Merge "Revert "Added a new network capability MMTEL"" am: e5b150a3cd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1928149

Change-Id: I32605bcfaf46c3ba675b7c2a0556df823a3e348d
2021-12-21 11:37:16 +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
a28c684662 Merge "Added a new network capability MMTEL" am: 95d180b5bf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927841

Change-Id: I3c917e5f64aad4b2e5307f909709f2b1b55181ac
2021-12-21 11:01:19 +00:00
Treehugger Robot
95d180b5bf Merge "Added a new network capability MMTEL" 2021-12-21 10:42:37 +00:00
Jiakai Zhang
86c139aedb Dexopt service-connectivity.
`service-connectivity` is a jar that system_server loads dynamically.
Such jars can be dexopted now. This CL adds `service-connectivity` to a
`systemserverclasspath_fragment`, which does not actually add the jar to
the classpath, but tells the build system to dexopt it.

NOTE: The corresponding `exported_systemserverclasspath_fragments` needs
to be added to the `prebuilt_apex` once a new prebuilt is dropped.

Bug: 203198541
Test: m com.android.tethering
Change-Id: I53745baaf1bc7142cc12a1e6cd8d84c9b338ac9d
Merged-In: I53745baaf1bc7142cc12a1e6cd8d84c9b338ac9d
Merged-In: I9a009493fe0482967ab1f92516514715cfd457d6
2021-12-21 09:36:33 +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
2840adf26f Merge "[MS10.2] Move multiplySafeByRational to NetworkStatsUtils" am: c6f89d4832 am: c407c3315f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919247

Change-Id: Iba3923aba315afcc5b3158b09e6ef89200a0b2c2
2021-12-21 01:46:04 +00:00
Junyu Lai
c407c3315f Merge "[MS10.2] Move multiplySafeByRational to NetworkStatsUtils" am: c6f89d4832
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919247

Change-Id: I6153ec51769823fcd28347e2fec5b98a92c938f3
2021-12-21 01:35:24 +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
05d00b50fd Merge "Rename libbpf to libbpf_bcc" am: e44ea016e1 am: 7bf5e61c37
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1906032

Change-Id: I11f11979a9e9c3fd2748b6d41929643b6ca29e10
2021-12-17 01:13:50 +00:00
Treehugger Robot
7bf5e61c37 Merge "Rename libbpf to libbpf_bcc" am: e44ea016e1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1906032

Change-Id: Ifefef316520369af948eefc5e65e2f590cc79c7e
2021-12-17 00:53:15 +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
c063140c7a Merge "Genericize NC#hasSameUids" am: a0d5980011 am: 0c479d5f82
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919250

Change-Id: I023a30bb9f593f150b73423daea4d4d1379b10fa
2021-12-16 16:13:01 +00:00
Treehugger Robot
0c479d5f82 Merge "Genericize NC#hasSameUids" am: a0d5980011
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919250

Change-Id: I22725a20c80bde87716ff5a9d44d76fcd4b95f2b
2021-12-16 15:54:01 +00:00
Ayush Sharma
626bac0e8c Merge changes from topic "revert-1551943-vpn-impl-FKOLCXTDDT" am: e89170bcb1 am: 23756bef7d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927304

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

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

Change-Id: I97acfec334f9a6deffaf4a8ca914ed2953af6739
2021-12-16 15:39:49 +00:00
Treehugger Robot
a0d5980011 Merge "Genericize NC#hasSameUids" 2021-12-16 15:37:06 +00:00
Ayush Sharma
23756bef7d Merge changes from topic "revert-1551943-vpn-impl-FKOLCXTDDT" am: e89170bcb1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927304

Change-Id: I309fa33ec3ab757d06c02b374bcd7631969c934c
2021-12-16 15:16:55 +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
1bf71ba427 Merge "Add makeDependencies method in IpSecService related tests" am: 3c1e7398a4 am: c6b730ce81
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1904464

Change-Id: I8475912fc900e347217ad2e26b175dadbf10cf02
2021-12-16 13:02:19 +00:00
Aaron Huang
c6b730ce81 Merge "Add makeDependencies method in IpSecService related tests" am: 3c1e7398a4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1904464

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

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

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

Change-Id: I2bf2ed0090c7d47dd9c9b72a6ee64cd36693f9ae
2021-12-16 11:49:25 +00:00