Commit Graph

43627 Commits

Author SHA1 Message Date
Yan Yan
4ecd509027 [automerger skipped] Set up and tear down test network in TestNetworkRunnable am: 144ae3c76a am: b44d08eece -s ours
am skip reason: Merged-In I0e08a6ea299e6ad94d69806a2d76fa155653b62a with SHA-1 144ae3c76a is already in history

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

Change-Id: Iaf466a4446aeecf34ea54dbbe5fe56df596f02bd
2021-06-16 11:01:47 +00:00
Lorenzo Colitti
e5ca7087a8 [automerger skipped] Verify kernel implementation of AES-CTR am: 816c800df3 -s ours am: 2baeaa8d16 -s ours
am skip reason: Merged-In Ib626a6c3999b7d682d0858e92d0dbb5138fdc45d with SHA-1 0c60279648 is already in history

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

Change-Id: I2fe91d23188fb5863d022c25bd038d0bf58ce551
2021-06-16 10:54:36 +00:00
Lorenzo Colitti
143197a1bc [automerger skipped] Verify kernel implementation of ChaCha20Poly1305 am: 09527d67ca -s ours am: f9b6e17eed -s ours
am skip reason: Merged-In Ia29540c7fd6848a89bfa2d25c6a87921e45d98da with SHA-1 80be81b302 is already in history

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

Change-Id: Idfdeb7d46264f5bd5cea170433565aee71a50a8d
2021-06-16 10:54:34 +00:00
Lorenzo Colitti
68251e07c0 [automerger skipped] Support algorithm configurability in PacketUtils EspHeader am: 2e65e9fa88 -s ours am: 677cdea1a4 -s ours
am skip reason: Merged-In I53f59815d6cb879dae622fcbd17616564a97111a with SHA-1 00db30f3a0 is already in history

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

Change-Id: I7a03ec1c9b21630a087169c424ebbb0ce5ef1ebd
2021-06-16 10:54:32 +00:00
Yan Yan
1e3a546148 [automerger skipped] Set up and tear down test network in TestNetworkRunnable am: 144ae3c76a -s ours am: ff18d2e4d1 -s ours
am skip reason: Merged-In I0e08a6ea299e6ad94d69806a2d76fa155653b62a with SHA-1 29487b12d5 is already in history

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

Change-Id: I292d260a4da7911ede2bbc5cbfe95b028acf3e69
2021-06-16 10:54:30 +00:00
Yan Yan
b44d08eece Set up and tear down test network in TestNetworkRunnable am: 144ae3c76a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14988700

Change-Id: I57411f845503f0f7d1bdc2800d16208ba6b46f2e
2021-06-16 10:45:39 +00:00
Lorenzo Colitti
2baeaa8d16 [automerger skipped] Verify kernel implementation of AES-CTR am: 816c800df3 -s ours
am skip reason: Merged-In Ib626a6c3999b7d682d0858e92d0dbb5138fdc45d with SHA-1 0c60279648 is already in history

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

Change-Id: Ie93af16e53168f4c00bf6c21eb9bc02b15fa74ee
2021-06-16 10:44:33 +00:00
Lorenzo Colitti
f9b6e17eed [automerger skipped] Verify kernel implementation of ChaCha20Poly1305 am: 09527d67ca -s ours
am skip reason: Merged-In Ia29540c7fd6848a89bfa2d25c6a87921e45d98da with SHA-1 80be81b302 is already in history

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

Change-Id: I11d84b5167b36e2a77543ee492ea7fbe7aebddc5
2021-06-16 10:44:31 +00:00
Lorenzo Colitti
677cdea1a4 [automerger skipped] Support algorithm configurability in PacketUtils EspHeader am: 2e65e9fa88 -s ours
am skip reason: Merged-In I53f59815d6cb879dae622fcbd17616564a97111a with SHA-1 00db30f3a0 is already in history

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

Change-Id: I25d0b5a71654b240cad649f755ce19176328d3a0
2021-06-16 10:44:29 +00:00
Yan Yan
ff18d2e4d1 [automerger skipped] Set up and tear down test network in TestNetworkRunnable am: 144ae3c76a -s ours
am skip reason: Merged-In I0e08a6ea299e6ad94d69806a2d76fa155653b62a with SHA-1 29487b12d5 is already in history

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

Change-Id: I8e3e012a0cb14012e025ba5d2e0efa416b1d3c1e
2021-06-16 10:44:26 +00:00
Lucas Lin
3705e5c1ac Merge "Add a test to check if the VPN type is set or not" am: 3b7c0749d5 am: 1ed1f3fcf8 am: d71d5fd659
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733785

Change-Id: I01c5d5241c589a89ce37d22b61e348ac4908609f
2021-06-16 04:35:33 +00:00
Lorenzo Colitti
074c2a9ed3 [automerger skipped] Correctly get uids for per-app network preferences am: 659a0e145f am: 3288cb52bc -s ours
am skip reason: Merged-In I7d75cdb02041e7a202254be2eaeca6c2b02d7c29 with SHA-1 659a0e145f is already in history

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

Change-Id: I071b09a56d615ade4f0810c6fc86c79bda446e01
2021-06-16 04:26:31 +00:00
Lucas Lin
d71d5fd659 Merge "Add a test to check if the VPN type is set or not" am: 3b7c0749d5 am: 1ed1f3fcf8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733785

Change-Id: Iba0daf89608e68b5e17326b9943f438d3f9ae2c6
2021-06-16 04:22:38 +00:00
Lorenzo Colitti
3288cb52bc Correctly get uids for per-app network preferences am: 659a0e145f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14986139

Change-Id: I713bcdc3d0008074f8603263e415097322b26f4c
2021-06-16 04:07:10 +00:00
Lucas Lin
1ed1f3fcf8 Merge "Add a test to check if the VPN type is set or not" am: 3b7c0749d5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733785

Change-Id: I33a31c80f5cf30f329fc168f0b7cc291add0d7e9
2021-06-16 04:00:13 +00:00
Chiachang Wang
05d6930b87 Merge "Ignore testFactoryReset in instant app mode" am: f3283e6b93 am: c60aab0243 am: c17bbec538
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1735673

Change-Id: Icd885192e55d9fc47e98841bd65d4ccebc02123c
2021-06-16 02:54:55 +00:00
Chiachang Wang
c17bbec538 Merge "Ignore testFactoryReset in instant app mode" am: f3283e6b93 am: c60aab0243
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1735673

Change-Id: Ibf0f8cf56360ffaa9c94f089018bbfe885373706
2021-06-16 02:35:26 +00:00
Lucas Lin
3b7c0749d5 Merge "Add a test to check if the VPN type is set or not" 2021-06-16 02:22:45 +00:00
Chiachang Wang
c60aab0243 Merge "Ignore testFactoryReset in instant app mode" am: f3283e6b93
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1735673

Change-Id: I497b71bf3a54c177f1b6e2cd63b3588b3c85f2cb
2021-06-16 02:06:37 +00:00
Lorenzo Colitti
816c800df3 Verify kernel implementation of AES-CTR
This CL adds a test to verify kernel implementation of AES-CTR

Since there is no hardware that first launched with SDK beyond R
at the time of writing this CL, new tests for AES-CTR were manually
enabled and verified on coral (coral-kernel already supports
AES-CTR)

Bug: 171083832
Test: atest IpSecAlgorithmImplTest
Original-Change: https://android-review.googlesource.com/1503695
Merged-In: Ib626a6c3999b7d682d0858e92d0dbb5138fdc45d
Change-Id: Ib626a6c3999b7d682d0858e92d0dbb5138fdc45d
2021-06-16 02:06:11 +00:00
Lorenzo Colitti
09527d67ca Verify kernel implementation of ChaCha20Poly1305
This CL adds the test infra for testing kernel implementation of IPsec
algorithms and a test for ChaCha20Poly1305

Since there is no hardware that first launched with SDK beyond R at the
time of writing this CL, the test for ChaChaPoly was manually
enabled and verified on the pixel with an updated kernel

Bug: 171083832
Test: atest IpSecAlgorithmImplTest
Original-Change: https://android-review.googlesource.com/1503694
Merged-In: Ia29540c7fd6848a89bfa2d25c6a87921e45d98da
Change-Id: Ia29540c7fd6848a89bfa2d25c6a87921e45d98da
2021-06-16 02:05:07 +00:00
Lorenzo Colitti
e90f61efdb [automerger skipped] Correctly get uids for per-app network preferences am: 659a0e145f -s ours am: 067050a1a4 -s ours
am skip reason: Merged-In I7d75cdb02041e7a202254be2eaeca6c2b02d7c29 with SHA-1 b6b6a4335a is already in history

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

Change-Id: I71214956e1061517554b590a9bbcfb29ecbc0fc5
2021-06-16 02:03:33 +00:00
Lorenzo Colitti
067050a1a4 [automerger skipped] Correctly get uids for per-app network preferences am: 659a0e145f -s ours
am skip reason: Merged-In I7d75cdb02041e7a202254be2eaeca6c2b02d7c29 with SHA-1 b6b6a4335a is already in history

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

Change-Id: Iaee7562764d7d82813e9978bbed5b0382b663e48
2021-06-16 02:01:07 +00:00
Lorenzo Colitti
2e65e9fa88 Support algorithm configurability in PacketUtils EspHeader
This CL adds support to configure the IPsec algortihms to build
EspHeader.

This is a prepration CL to test kernel implementation of IPsec
algorithms.

Bug: 171083832
Test: atest CtsNetTestCases
Original-Change: https://android-review.googlesource.com/1503693
Merged-In: I53f59815d6cb879dae622fcbd17616564a97111a
Change-Id: I53f59815d6cb879dae622fcbd17616564a97111a
2021-06-16 01:58:27 +00:00
Lorenzo Colitti
76b4891a97 Merge changes from topic "per-app-cts" am: 5f78e30839 am: f9eb2c7b0b am: 64132f489a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1665079

Change-Id: I7c5a36617fb3d5b401daec80b48a069b5538fac3
2021-06-16 01:57:50 +00:00
James Mattis
c415441129 Update CS so that per-app OEM APIs can be tested am: fa270db5f7 am: 6c54d5e4c4 am: 39a42aefc6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723050

Change-Id: I6b8d4269db7592a2c9bafca480bac184e46736fa
2021-06-16 01:57:47 +00:00
Chiachang Wang
f3283e6b93 Merge "Ignore testFactoryReset in instant app mode" 2021-06-16 01:49:51 +00:00
Yan Yan
144ae3c76a Set up and tear down test network in TestNetworkRunnable
Allow test caller to construct a TestNetworkRunnable to run a
test with a test network.

This is a preparation for adding tests to verify kernel
implementation of IPsec algorithms.

Bug: 171083832
Test: atest Ikev2VpnTest
Original-Change: https://android-review.googlesource.com/1503692
Merged-In: I0e08a6ea299e6ad94d69806a2d76fa155653b62a
Change-Id: I0e08a6ea299e6ad94d69806a2d76fa155653b62a
2021-06-16 01:48:51 +00:00
Lorenzo Colitti
64132f489a Merge changes from topic "per-app-cts" am: 5f78e30839 am: f9eb2c7b0b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1665079

Change-Id: Ia1d2b7a036a8ac07133a0df90f02b66a974d1dee
2021-06-16 01:30:07 +00:00
James Mattis
39a42aefc6 Update CS so that per-app OEM APIs can be tested am: fa270db5f7 am: 6c54d5e4c4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723050

Change-Id: I5f8bc3a60d92e86047debd9363e5dddf06da6ee8
2021-06-16 01:30:05 +00:00
Lorenzo Colitti
f9eb2c7b0b Merge changes from topic "per-app-cts" am: 5f78e30839
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1665079

Change-Id: I214f7dd18806d6880b4fe40a6cd5bbe63819f9a0
2021-06-16 01:11:33 +00:00
James Mattis
6c54d5e4c4 Update CS so that per-app OEM APIs can be tested am: fa270db5f7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723050

Change-Id: Ib5937d0fd732f915416e957299e739fe10d0bf55
2021-06-16 01:11:26 +00:00
Lorenzo Colitti
5f78e30839 Merge changes from topic "per-app-cts"
* changes:
  CTS tests for setOemNetworkPreference
  Update CS so that per-app OEM APIs can be tested
2021-06-16 00:47:06 +00:00
Lorenzo Colitti
659a0e145f Correctly get uids for per-app network preferences
Per-app network functionality assumed all apps were installed for user 0
which is not always the case. This fix will address that by checking for
the existance of an app for all users and adding it to the per-app
network preference as was originally intended. Prior, no apps were
included if they were not installed for user 0 even if they were
available for another user such as user 10 in automotive.

Bug: 189838408
Test: atest FrameworksNetTests
atest FrameworksNetIntegrationTests
atest CtsNetTestCases

Original-Change: https://android-review.googlesource.com/1723617
Merged-In: I7d75cdb02041e7a202254be2eaeca6c2b02d7c29
Change-Id: I7d75cdb02041e7a202254be2eaeca6c2b02d7c29
2021-06-15 21:56:13 +00:00
James Mattis
db143f99cf CTS tests for setOemNetworkPreference
CTS tests to validate the setOemNetworkPreference API on
ConnectivityManager. Additionally, a small bit of cleanup for
assumptions around the Wi-Fi feature.

Bug: 176496580
Bug: 176494815
Test: atest CtsNetTestCases:
android.net.cts.ConnectivityManagerTest#
testSetOemNetworkPreferenceForTestPref --iterations
atest CtsNetTestCases:
android.net.cts.ConnectivityManagerTest#
testSetOemNetworkPreferenceForTestOnlyPref --iterations

Change-Id: Ia3e4b336123b60f6df1582aca2979129112afedc
2021-06-15 12:35:18 -07:00
Lorenzo Colitti
444d435898 [automerger skipped] Don't run testGetAllNetworkStateSnapshots in instant app mode am: 1ee5ba31a6 -s ours am: ee260679f7 -s ours
am skip reason: Merged-In I2897462f4ef6c019b80a3b5159b1c41f397af8de with SHA-1 1ee5ba31a6 is already in history

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

Change-Id: Iec09b43cbf5fde51ed81c0072073904401c7b23b
2021-06-15 17:42:17 +00:00
Lorenzo Colitti
4d661c69c3 Merge "Cleanup commit to remove @SkipPresubmit and fix nits" am: 81ede794c7 am: ff949864da am: 4584e16096
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729418

Change-Id: I4edaeb1bdc7e0d58ca9fb421e2919f1b7d3babd4
2021-06-15 17:42:01 +00:00
Lorenzo Colitti
b33463ce1b Merge "Verify kernel implementation of AES-CMAC" am: a1363cbd82 am: 61cad6e216 am: bb9855adb6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1697312

Change-Id: Ide511b730860921c909bed0dab59ed99aba3a785
2021-06-15 17:41:35 +00:00
Lorenzo Colitti
e396d3a120 Merge "Don't run testGetAllNetworkStateSnapshots in instant app mode" am: b91372a50f am: ec110e2e24 am: 7ec0a4852a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737396

Change-Id: Ie69d104e91ac13d0403ff11a5e7f8a6d93bc4cb1
2021-06-15 17:37:30 +00:00
Anton Hansson
69f32ee3a1 [automerger skipped] Merge "Add tethering bootclasspath fragment to its sdk" am: ee350966fa am: 11b6b499aa -s ours am: f588321116 -s ours
am skip reason: Merged-In Ib2ebb3893135b4dd91812f1f1b0915540cfd64cb with SHA-1 3669599dec is already in history

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

Change-Id: Ifcd48f675a3289c0995c93e13416f2845aa161be
2021-06-15 17:35:14 +00:00
Lorenzo Colitti
daa569a6e3 [automerger skipped] Merge changes I3fffbf4a,If557b0a1 into sc-dev am: bba6383a73 -s ours am: 52832c76f0 -s ours
am skip reason: Merged-In I3fffbf4a5dea68e61349de8b41bea49b8a319f86 with SHA-1 4425a6147c is already in history

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

Change-Id: I918fc385b407f29a23d44114b732034bf3ef92e3
2021-06-15 17:34:45 +00:00
Lucas Lin
d3195fe2e7 Merge "Send a proxy broadcast when apps moved from/to a VPN" am: cfc86ef0f6 am: f7aa7c51ee am: c3b4cf2e19
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1717735

Change-Id: Icb1af8bf4ded2984d4c10385bf692d95c6d2e55d
2021-06-15 17:34:24 +00:00
Lorenzo Colitti
e49931138d Merge "Verify kernel implementation of AES-XCBC" am: ea56397997 am: 6c08a1824b am: 1082fd5b39
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503696

Change-Id: Iac2a6038ad699bf741db3318df551ac94cef96e7
2021-06-15 17:34:01 +00:00
Lorenzo Colitti
e703cb56a8 Merge "Verify kernel implementation of AES-CTR" am: b8aeaa220c am: 069c4c996a am: 12da36445e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503695

Change-Id: I276e2cdb690bb914c800d193b2db8d33412ab83a
2021-06-15 17:33:10 +00:00
TreeHugger Robot
49c6d72288 [automerger skipped] Merge "Add unit test when querying TYPE_WIFI + null/empty/non-null subscriberId" into sc-dev am: 97e90536a8 -s ours am: 431266e81e -s ours
am skip reason: Merged-In Id4ae06840e1749997e970b8f1ec391060967bd47 with SHA-1 caa6f1793d is already in history

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

Change-Id: If5e2316f3db265f3c0dd916415eb18bc508bf29b
2021-06-15 17:32:38 +00:00
Nucca Chen
9db6bc1dd8 Merge "Improve dumping IPv4 map entries." am: 26f799f2d7 am: 7bd9af79a7 am: 21a62c5bcb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737394

Change-Id: I225cc3c26e3142f648846259f7e5d4e273f24468
2021-06-15 17:32:26 +00:00
Remi NGUYEN VAN
61f472c814 Merge "Fix KeepalivePacketDataUtilTest crash on eng build" am: efdffa82f8 am: ddca01a6af am: d5de41b6ff
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736261

Change-Id: I017930e80c66ad465e5d27d96e2b09159081308d
2021-06-15 17:31:43 +00:00
Treehugger Robot
2735eed360 Merge "Dump underlying BPF traffic stats as well as higher-level stats." am: a79b785ff0 am: 3a6c47e8ca am: 5298ddbb00
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737393

Change-Id: I0c64de1ecf6956266f1673d37472adb99c7baaa4
2021-06-15 17:31:06 +00:00
Treehugger Robot
b9ff53459e Merge "Add unit test when querying TYPE_WIFI + null/empty/non-null subscriberId" am: 1dba7454b3 am: 703321fc81 am: eb7d65af96
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727826

Change-Id: I2bcd17cc7d46c4eeae6835b10f77fc84bd5d067b
2021-06-15 17:30:30 +00:00
Lorenzo Colitti
f6e7580537 Merge "Verify kernel implementation of ChaCha20Poly1305" am: 69c14d531c am: 2ddc21f483 am: 19fb7cbecf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503694

Change-Id: Id2a70fb5ca7c7440e1eb805a92f92ea001a25c8f
2021-06-15 17:30:15 +00:00