Commit Graph

44491 Commits

Author SHA1 Message Date
TreeHugger Robot
7117ec00ba [automerger skipped] Merge "Add tests for in-kernel VPN/VCN dataplane" into sc-dev am: f3c6c3e5b4 am: 675f699927 -s ours
am skip reason: Merged-In I33f14f2d0f71013a594fd4c8c3914a590d30ea06 with SHA-1 1117e853f9 is already in history

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

Change-Id: Ie892a79f66a48be50e21b5a3b09e143f5c38bb3e
2021-07-03 02:27:49 +00:00
Maciej Żenczykowski
ec8adb3089 [automerger skipped] ipv4 tethering offload - decrement ttl during forwarding am: f416b8a1ff am: 27c370a509 -s ours
am skip reason: Merged-In I88e5293a54b7867a8e7dd76f6fd8e2a52d31e51a with SHA-1 c29af79e26 is already in history

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

Change-Id: Ifde6fe778792bdf73f2fcdc8c203d1ee384ee998
2021-07-03 02:27:23 +00:00
TreeHugger Robot
675f699927 Merge "Add tests for in-kernel VPN/VCN dataplane" into sc-dev am: f3c6c3e5b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15191238

Change-Id: I90f31700dd49b958c3eb33a4d22e90998236d147
2021-07-03 02:15:41 +00:00
Maciej Żenczykowski
27c370a509 ipv4 tethering offload - decrement ttl during forwarding am: f416b8a1ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15192718

Change-Id: I8590f50c99335b5b5549f1c3da3c009b9ec24e32
2021-07-03 02:12:35 +00:00
TreeHugger Robot
f3c6c3e5b4 Merge "Add tests for in-kernel VPN/VCN dataplane" into sc-dev 2021-07-03 02:01:54 +00:00
Maciej Żenczykowski
f416b8a1ff ipv4 tethering offload - decrement ttl during forwarding
Bug: 192635131
Test: atest, TreeHugger, flashed on phone, forwarded ipv4 traffic
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Original-Change: https://android-review.googlesource.com/1755049
Merged-In: I88e5293a54b7867a8e7dd76f6fd8e2a52d31e51a
Change-Id: I88e5293a54b7867a8e7dd76f6fd8e2a52d31e51a
2021-07-02 22:08:34 +00:00
Maciej Żenczykowski
0500c9b1a9 Merge "ipv4 tethering offload - decrement ttl during forwarding" am: f21f5357e7 am: f54ce8312b am: 212fa79a4b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755049

Change-Id: Ib34a1b900ea90fc7cc166cd34b72058b40f059a7
2021-07-02 21:51:42 +00:00
Maciej Żenczykowski
212fa79a4b Merge "ipv4 tethering offload - decrement ttl during forwarding" am: f21f5357e7 am: f54ce8312b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755049

Change-Id: Idb6f95c96fa7832f4482fb6fc0237bb242ca8794
2021-07-02 21:36:48 +00:00
Maciej Żenczykowski
f54ce8312b Merge "ipv4 tethering offload - decrement ttl during forwarding" am: f21f5357e7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755049

Change-Id: I5e09f466e574a8a16dc977cf18eb4922c3dbc480
2021-07-02 21:17:43 +00:00
Maciej Żenczykowski
f21f5357e7 Merge "ipv4 tethering offload - decrement ttl during forwarding" 2021-07-02 21:06:41 +00:00
Benedict Wong
6dd0516b56 Add tests for in-kernel VPN/VCN dataplane
This change adds relevant tests for the migrateTun functionality in
NetworkStats.

Bug: 190620024
Test: atest NetworkStatsTest
Original-Change: https://android-review.googlesource.com/1749069
Merged-In: I33f14f2d0f71013a594fd4c8c3914a590d30ea06
Change-Id: I33f14f2d0f71013a594fd4c8c3914a590d30ea06
2021-07-02 19:29:06 +00:00
TreeHugger Robot
aac387b406 [automerger skipped] Merge "Allow non-VPNs to have underlying networks." into sc-dev am: 0868536de9 am: b8beb3d6d2 -s ours
am skip reason: Merged-In I53d6080f48707ff3c37fbfbef534284ba77a7432 with SHA-1 4703a8c392 is already in history

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

Change-Id: I491bbd1d302470f2aabdb802fa403c26ab8d8a16
2021-07-02 19:25:06 +00:00
Benedict Wong
a97443a667 Merge "Add tests for in-kernel VPN/VCN dataplane" am: 64619cabc1 am: 4793a34212 am: f95947b96f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749069

Change-Id: I95fe15f915551c479e9bf4e9defd70ac897bf35b
2021-07-02 19:24:29 +00:00
TreeHugger Robot
06559c7495 [automerger skipped] Merge "Allow non-VPNs to have underlying networks." into sc-dev am: 0868536de9 -s ours am: 1a65e18796 -s ours
am skip reason: Merged-In I53d6080f48707ff3c37fbfbef534284ba77a7432 with SHA-1 bd079455f1 is already in history

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

Change-Id: Ifdd8d8ea0cf12fcc9d3f71da22642d9a5f76c223
2021-07-02 19:24:07 +00:00
TreeHugger Robot
b8beb3d6d2 Merge "Allow non-VPNs to have underlying networks." into sc-dev am: 0868536de9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15182605

Change-Id: I6f9895eee27be8f6b179270f15a0bdf56baf47bd
2021-07-02 19:12:34 +00:00
Benedict Wong
f95947b96f Merge "Add tests for in-kernel VPN/VCN dataplane" am: 64619cabc1 am: 4793a34212
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749069

Change-Id: I503c883fd61679862563abea9264d1806a59be62
2021-07-02 19:12:24 +00:00
TreeHugger Robot
1a65e18796 [automerger skipped] Merge "Allow non-VPNs to have underlying networks." into sc-dev am: 0868536de9 -s ours
am skip reason: Merged-In I53d6080f48707ff3c37fbfbef534284ba77a7432 with SHA-1 bd079455f1 is already in history

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

Change-Id: I0ec642a8f21b404f9764472088bdddd985b8042f
2021-07-02 19:11:32 +00:00
Benedict Wong
4793a34212 Merge "Add tests for in-kernel VPN/VCN dataplane" am: 64619cabc1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749069

Change-Id: I83fd7c2c81540071bdac53f59e5b518fcc6da3e8
2021-07-02 18:58:06 +00:00
TreeHugger Robot
0868536de9 Merge "Allow non-VPNs to have underlying networks." into sc-dev 2021-07-02 18:56:30 +00:00
Benedict Wong
64619cabc1 Merge "Add tests for in-kernel VPN/VCN dataplane" 2021-07-02 18:42:15 +00:00
Treehugger Robot
b797583891 [automerger skipped] Merge "Listen EXTERNAL_APPLICATIONS_AVAILABLE intent" am: 321558ffe8 am: 23825be810 -s ours am: a19ef38b5c -s ours
am skip reason: Merged-In Ia11ca4a7ba6fc1b87c27c0c40e36c91d9cdb322a with SHA-1 4ac225baed is already in history

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

Change-Id: I6b437467ea650e8e504918e5aadfa0d91e26e0fe
2021-07-02 17:33:14 +00:00
Treehugger Robot
a19ef38b5c [automerger skipped] Merge "Listen EXTERNAL_APPLICATIONS_AVAILABLE intent" am: 321558ffe8 am: 23825be810 -s ours
am skip reason: Merged-In Ia11ca4a7ba6fc1b87c27c0c40e36c91d9cdb322a with SHA-1 4ac225baed is already in history

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

Change-Id: I6cbf3b51d083b3ca503d61bd9253ee495ff704f4
2021-07-02 17:17:35 +00:00
Treehugger Robot
23825be810 Merge "Listen EXTERNAL_APPLICATIONS_AVAILABLE intent" am: 321558ffe8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755054

Change-Id: I6611ab9e0550bd36bb941ed9136069fd19a7ab2a
2021-07-02 17:07:46 +00:00
Treehugger Robot
321558ffe8 Merge "Listen EXTERNAL_APPLICATIONS_AVAILABLE intent" 2021-07-02 16:56:12 +00:00
Paul Hu
a624df8f8a Merge "Listen EXTERNAL_APPLICATIONS_AVAILABLE intent" into sc-dev am: 790d3eb079 am: 6f9ba0496e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14772860

Change-Id: I5475146261648a98e27823d57a2d3ea3df44422b
2021-07-02 14:43:40 +00:00
Paul Hu
2f553e5bbd Merge "Listen EXTERNAL_APPLICATIONS_AVAILABLE intent" into sc-dev am: 790d3eb079 am: cedfba2e89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14772860

Change-Id: Ie9633dc70ea4086d542edc43eea7427c96afd62e
2021-07-02 14:36:41 +00:00
Treehugger Robot
95c3f8ca89 [automerger skipped] Merge "Force only system uid can set uids allowed on restricted networks" am: 47202851ec am: a1e54368ae -s ours am: 486710cbb8 -s ours
am skip reason: Merged-In I175a831671d3e52460d28203b09f6c0dda56b61c with SHA-1 03635b3ad5 is already in history

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

Change-Id: Ib1034b01eb1da4be201e2210489b0e9abd6ed735
2021-07-02 14:36:30 +00:00
paulhu
8a4ce40acb Listen EXTERNAL_APPLICATIONS_AVAILABLE intent
- Some applications are installed on external storage and they
  are unavailable until exernal storage installed them
  completely. And their permission need update after becoming
  available. Thus, listen EXTERNAL_APPLICATIONS_AVAILABLE intent
  and update those package whose is listed in chaged package
  list.
- Remove user argument on buildPackageInfo() because the uid on
  ApplicationInfo is based uid.

Bug: 145234989
Test: atest FrameworksNetTests
Merged-In: Ia11ca4a7ba6fc1b87c27c0c40e36c91d9cdb322a

Change-Id: Ia11ca4a7ba6fc1b87c27c0c40e36c91d9cdb322a
2021-07-02 22:35:26 +08:00
Paul Hu
6f9ba0496e Merge "Listen EXTERNAL_APPLICATIONS_AVAILABLE intent" into sc-dev am: 790d3eb079
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14772860

Change-Id: I9b09ac787d1ec4580c724426a66abf8c1446217c
2021-07-02 14:32:26 +00:00
Paul Hu
cedfba2e89 Merge "Listen EXTERNAL_APPLICATIONS_AVAILABLE intent" into sc-dev am: 790d3eb079
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14772860

Change-Id: Ic9f4d305099262efb2ce8f7506cc0b06151717b5
2021-07-02 14:31:31 +00:00
Treehugger Robot
486710cbb8 [automerger skipped] Merge "Force only system uid can set uids allowed on restricted networks" am: 47202851ec am: a1e54368ae -s ours
am skip reason: Merged-In I175a831671d3e52460d28203b09f6c0dda56b61c with SHA-1 03635b3ad5 is already in history

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

Change-Id: I30b118cbcf773b9a382a50ccc5f5799b29afc9e0
2021-07-02 14:19:38 +00:00
Paul Hu
790d3eb079 Merge "Listen EXTERNAL_APPLICATIONS_AVAILABLE intent" into sc-dev 2021-07-02 14:17:17 +00:00
Treehugger Robot
9221ed06e2 Merge "Allow non-VPNs to have underlying networks." am: 5903d5646c am: 9a7c9c3c06 am: 8d1e3166cd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753619

Change-Id: I397060ae88f5c020ce9df080807f64c05742aa67
2021-07-02 14:07:43 +00:00
Treehugger Robot
a1e54368ae Merge "Force only system uid can set uids allowed on restricted networks" am: 47202851ec
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1755052

Change-Id: I20ad7457e8e91b35b6ee0659b1ec1fae3f008fe8
2021-07-02 14:07:31 +00:00
Treehugger Robot
4703a8c392 Allow non-VPNs to have underlying networks.
Certain network types, like the VCN, have underlying
networks for the purpose of data usage, but do not want to
propagate the underlying network capabilities.

Allow these networks to set underlying networks, but continue
not to propagate the capabilities.

Bug: 190620024
Test: new unit test
Original-Change: https://android-review.googlesource.com/1753619
Merged-In: I53d6080f48707ff3c37fbfbef534284ba77a7432
Change-Id: I53d6080f48707ff3c37fbfbef534284ba77a7432
2021-07-02 13:56:28 +00:00
Treehugger Robot
8d1e3166cd Merge "Allow non-VPNs to have underlying networks." am: 5903d5646c am: 9a7c9c3c06
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753619

Change-Id: Ic2188f15ce354e44436d4edc7500859e4eb09308
2021-07-02 13:55:33 +00:00
Treehugger Robot
47202851ec Merge "Force only system uid can set uids allowed on restricted networks" 2021-07-02 13:52:50 +00:00
Treehugger Robot
9a7c9c3c06 Merge "Allow non-VPNs to have underlying networks." am: 5903d5646c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753619

Change-Id: Ie6894fc292e5d6ef7f084abcf3ddbdfdd7540648
2021-07-02 13:38:21 +00:00
Treehugger Robot
5903d5646c Merge "Allow non-VPNs to have underlying networks." 2021-07-02 13:28:01 +00:00
Paul Hu
da81d316b0 Merge "Use Netd new added/removed uid range methods" into sc-dev am: 29194db12f am: 39828864dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14911836

Change-Id: I16ff8e265698963b79d6ce1d26637bfcb342c667
2021-07-02 12:34:26 +00:00
Paul Hu
8daae3a98d Merge "Use Netd new added/removed uid range methods" into sc-dev am: 29194db12f am: 3dc7387fdb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14911836

Change-Id: Iac2d178795d0864ae8279aa8fa79a4a0d680fb66
2021-07-02 12:34:01 +00:00
Paul Hu
3dc7387fdb Merge "Use Netd new added/removed uid range methods" into sc-dev am: 29194db12f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14911836

Change-Id: I5639000ecd2669b677c98e359cb042ac17a69efc
2021-07-02 12:21:16 +00:00
Paul Hu
39828864dd Merge "Use Netd new added/removed uid range methods" into sc-dev am: 29194db12f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14911836

Change-Id: Ie2a855902fd4ad04624a714c71bfaede6f0098e3
2021-07-02 12:20:24 +00:00
Paul Hu
29194db12f Merge "Use Netd new added/removed uid range methods" into sc-dev 2021-07-02 12:08:35 +00:00
paulhu
92f128c51c Force only system uid can set uids allowed on restricted networks
- Check whether calling UID/PID is system_server.
- For CTS test, enforce NETWORK_SETTINGS permission otherwise if
  it's a debug build.

Bug: 175199465
Test: atest FrameworksNetTests
Test: atest ConnectivityManagerTest#testUidsAllowedOnRestrictedNetworks
Merged-In: I175a831671d3e52460d28203b09f6c0dda56b61c

Change-Id: I175a831671d3e52460d28203b09f6c0dda56b61c
2021-07-02 20:04:50 +08:00
Maciej Żenczykowski
c29af79e26 ipv4 tethering offload - decrement ttl during forwarding
Bug: 192635131
Test: atest, TreeHugger, flashed on phone, forwarded ipv4 traffic
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I88e5293a54b7867a8e7dd76f6fd8e2a52d31e51a
2021-07-02 11:33:17 +00:00
Paul Hu
7f2d4f835e Merge "Force only system uid can set uids allowed on restricted networks" into sc-dev am: 77739d37b3 am: 93e9d0c1f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15172131

Change-Id: Ic1e1573a486e4483f2d59187e2313dde64e80e75
2021-07-02 11:16:10 +00:00
Paul Hu
12b0f97cd7 Merge "Force only system uid can set uids allowed on restricted networks" into sc-dev am: 77739d37b3 am: 75ca971c66
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15172131

Change-Id: I83ddf631f48452f92967043201c029e80b413587
2021-07-02 11:15:44 +00:00
Paul Hu
75ca971c66 Merge "Force only system uid can set uids allowed on restricted networks" into sc-dev am: 77739d37b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15172131

Change-Id: I0e35396ef80f046aa31931940714dee65a7b781c
2021-07-02 11:02:59 +00:00
Paul Hu
93e9d0c1f6 Merge "Force only system uid can set uids allowed on restricted networks" into sc-dev am: 77739d37b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15172131

Change-Id: Ic688c1515f55de1a7f1ac784c5f6172429ac1902
2021-07-02 11:02:26 +00:00