Commit Graph

46028 Commits

Author SHA1 Message Date
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
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
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
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
Treehugger Robot
139f43509e Merge "Support testing upload/download packets" 2021-12-23 04:22:59 +00:00
TreeHugger Robot
78a1e45e95 Merge "Dexopt service-connectivity." into stage-aosp-master 2021-12-23 04:17:45 +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
e30e727a57 Merge "[MS15.2] Move SUBSCRIBER_ID_MATCH_RULE_* constants to static lib" am: 78d36d7653 am: 6e952001f8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930824

Change-Id: I5583e15c57f66c8b7e1a8989a71b80646add8591
2021-12-23 02:00:10 +00:00
Junyu Lai
6e952001f8 Merge "[MS15.2] Move SUBSCRIBER_ID_MATCH_RULE_* constants to static lib" am: 78d36d7653
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930824

Change-Id: I1ba696a37c469387f64c57d2530efa2f9f975715
2021-12-23 01:50:12 +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
Jiakai Zhang
ce3bd3a768 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: I5a9b68172c38dd0b9f7a8f88bee738043ed3a96f
(cherry picked from commit 9ecc66ddba)
2021-12-22 19:36:39 +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
0f96c5d627 Merge "[DU02]Remove DevicePolicyManagerInternal from NetworkStatsAccess" am: bacbe802c1 am: 6f9dbdb13a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1925684

Change-Id: I53d13604c150e4fbe4914afab3ee5bf173fb5e5b
2021-12-22 14:47:43 +00:00
Frank Li
6f9dbdb13a Merge "[DU02]Remove DevicePolicyManagerInternal from NetworkStatsAccess" am: bacbe802c1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1925684

Change-Id: Iab2c955167d0fb2d02a640c36410f3e3b26f8f73
2021-12-22 14:30:31 +00:00
Frank Li
bacbe802c1 Merge "[DU02]Remove DevicePolicyManagerInternal from NetworkStatsAccess" 2021-12-22 14:13:55 +00:00
Treehugger Robot
94c8349b26 [automerger skipped] Merge "Dexopt service-connectivity." am: 42fb8d0703 -s ours am: 23404d4aa3 -s ours am: ba47beef27 -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: Ia213fc90602163baf7f03132a4703ac8187392d9
2021-12-22 14:09:23 +00:00
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
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
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
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
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
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
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
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
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