Commit Graph

2972 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Lorenzo Colitti
a368e899c8 Merge "Support algorithm configurability in PacketUtils EspHeader" am: ec5d07c59e am: 3231562efc am: 6c7f137f2f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503693

Change-Id: Ie09da5f251ec838a1f316b61343ddbb9376220de
2021-06-15 17:23:02 +00:00
Lorenzo Colitti
af578b22a0 Don't run testGetAllNetworkStateSnapshots in instant app mode am: 1ee5ba31a6 am: e5f9800e0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14935371

Change-Id: Ia22331d8b3c7fa2eeb5b939871a680d6fd74e43a
2021-06-15 16:49:10 +00:00
Lorenzo Colitti
e5f9800e0b Don't run testGetAllNetworkStateSnapshots in instant app mode am: 1ee5ba31a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14935371

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

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

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

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

Change-Id: Iffd5043dc798773405cf10c41c60597c0b8aaaa7
2021-06-15 15:13:18 +00:00
Lorenzo Colitti
81ede794c7 Merge "Cleanup commit to remove @SkipPresubmit and fix nits" 2021-06-15 14:54:07 +00:00
Lorenzo Colitti
a1363cbd82 Merge "Verify kernel implementation of AES-CMAC" 2021-06-15 14:53:36 +00:00
Lorenzo Colitti
1ee5ba31a6 Don't run testGetAllNetworkStateSnapshots in instant app mode
Instant app mode doesn't have permission to request networks.
Thus, ignore the test in instant app mode.

Bug: 189724761
Test: CtsNetTestCases:ConnectivityManagerTest#testGetAllNetworkStateSnapshots \
      --instant
Original-Change: https://android-review.googlesource.com/1737396
Merged-In: I2897462f4ef6c019b80a3b5159b1c41f397af8de
Change-Id: I2897462f4ef6c019b80a3b5159b1c41f397af8de
2021-06-15 14:06:26 +00:00
Lorenzo Colitti
7ec0a4852a Merge "Don't run testGetAllNetworkStateSnapshots in instant app mode" am: b91372a50f am: ec110e2e24
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737396

Change-Id: I85bebb2a928b28cd8682e061ce5cc7433f47cec4
2021-06-15 13:42:57 +00:00
Lorenzo Colitti
ec110e2e24 Merge "Don't run testGetAllNetworkStateSnapshots in instant app mode" am: b91372a50f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737396

Change-Id: I9807baa0089b208c6831c73b86cfcee8026f1d6b
2021-06-15 13:38:58 +00:00
Lorenzo Colitti
b91372a50f Merge "Don't run testGetAllNetworkStateSnapshots in instant app mode" 2021-06-15 13:29:19 +00:00
TreeHugger Robot
38d2b058d9 Merge "Add unit test when querying TYPE_WIFI + null/empty/non-null subscriberId" into sc-dev am: 97e90536a8 am: 8448b67a15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14963611

Change-Id: Idd79cfc7ba74fafb2afa2c41d01e8a31c9322f9d
2021-06-15 09:52:38 +00:00
TreeHugger Robot
8448b67a15 Merge "Add unit test when querying TYPE_WIFI + null/empty/non-null subscriberId" into sc-dev am: 97e90536a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14963611

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

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

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

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

Change-Id: I2fc18571e6ecf36d919d9c5971c275f5c26ddfa4
2021-06-15 09:28:16 +00:00
Lucas Lin
cfc86ef0f6 Merge "Send a proxy broadcast when apps moved from/to a VPN" 2021-06-15 09:26:21 +00:00
Lorenzo Colitti
6c08a1824b Merge "Verify kernel implementation of AES-XCBC" am: ea56397997
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503696

Change-Id: Icd06cea452718f8771677a5737305c5a7fb4a720
2021-06-15 09:20:10 +00:00
Lorenzo Colitti
069c4c996a Merge "Verify kernel implementation of AES-CTR" am: b8aeaa220c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1503695

Change-Id: I3be7be57d109bc44e35826bf6629f79a67c1eae8
2021-06-15 09:20:00 +00:00
TreeHugger Robot
97e90536a8 Merge "Add unit test when querying TYPE_WIFI + null/empty/non-null subscriberId" into sc-dev 2021-06-15 09:16:57 +00:00
Lorenzo Colitti
ea56397997 Merge "Verify kernel implementation of AES-XCBC" 2021-06-15 09:12:35 +00:00
Lorenzo Colitti
b8aeaa220c Merge "Verify kernel implementation of AES-CTR" 2021-06-15 09:09:05 +00:00
Remi NGUYEN VAN
d5de41b6ff Merge "Fix KeepalivePacketDataUtilTest crash on eng build" am: efdffa82f8 am: ddca01a6af
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736261

Change-Id: Id5cc28a2387288bdb975c29da6571d44e939b932
2021-06-15 07:34:54 +00:00
Remi NGUYEN VAN
ddca01a6af Merge "Fix KeepalivePacketDataUtilTest crash on eng build" am: efdffa82f8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736261

Change-Id: I5debd8529ba5018ef421ca0dd1fc41905c014ac2
2021-06-15 07:17:28 +00:00