Chiachang Wang
c9ab9cbff1
Merge "Add test for CM#setAcceptUnvalidated" am: 27586f8210 am: d6d3bf0b89 am: 4da66b9d58
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731234
Change-Id: I4cc9039afe6a397645f072593eaa4a0da765ee2f
2021-06-16 15:55:16 +00:00
Chiachang Wang
5f2474577e
Merge "Add test for CM#setAcceptPartialConnectivity" am: 2693dc2696 am: 98e8422124 am: ef5a495829
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730545
Change-Id: I54f1ca91df0dc6898af74d84fba681d93f10bf0a
2021-06-16 15:55:07 +00:00
Chiachang Wang
4da66b9d58
Merge "Add test for CM#setAcceptUnvalidated" am: 27586f8210 am: d6d3bf0b89
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731234
Change-Id: If39fb3d39aee18dab8476fdac934724685c46817
2021-06-16 15:39:15 +00:00
Chiachang Wang
ef5a495829
Merge "Add test for CM#setAcceptPartialConnectivity" am: 2693dc2696 am: 98e8422124
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730545
Change-Id: Ie49fb789e8731ddac1465fed46f5f139d8ce10f6
2021-06-16 15:39:08 +00:00
Chiachang Wang
d6d3bf0b89
Merge "Add test for CM#setAcceptUnvalidated" am: 27586f8210
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731234
Change-Id: I524644366a398b34de8f659d0d0d275f3f513c0c
2021-06-16 15:29:47 +00:00
Chiachang Wang
98e8422124
Merge "Add test for CM#setAcceptPartialConnectivity" am: 2693dc2696
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730545
Change-Id: I702a17935b7e0a29d5c45e5ae6bd7ccf3c76eccd
2021-06-16 15:29:37 +00:00
Chiachang Wang
27586f8210
Merge "Add test for CM#setAcceptUnvalidated"
2021-06-16 15:17:51 +00:00
Chiachang Wang
2693dc2696
Merge "Add test for CM#setAcceptPartialConnectivity"
2021-06-16 15:17:37 +00:00
Remi NGUYEN VAN
8b9302ef61
Merge "Make tests compatible with mockito-extended" am: ad7108ce34 am: c3d789bff1 am: aec3a5e548
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737400
Change-Id: I34a18a9becc0b932c6a7df9546de195e85c2076e
2021-06-16 14:05:31 +00:00
Remi NGUYEN VAN
aec3a5e548
Merge "Make tests compatible with mockito-extended" am: ad7108ce34 am: c3d789bff1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737400
Change-Id: Ie5b04c5ea05d330dcc97d098720b08d4797927de
2021-06-16 13:56:01 +00:00
Remi NGUYEN VAN
c3d789bff1
Merge "Make tests compatible with mockito-extended" am: ad7108ce34
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737400
Change-Id: I3c6de9b5da64e3bb26b1dc75e9184cf373d313fe
2021-06-16 13:34:34 +00:00
Remi NGUYEN VAN
ad7108ce34
Merge "Make tests compatible with mockito-extended"
2021-06-16 13:22:37 +00:00
Junyu Lai
a90dcdbe31
Merge changes I627dcd0f,I81abc174,Id7948d21 am: 75090fb64e am: 93b8b38683 am: 8aa17e2a6a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731450
Change-Id: I248bec62a0fd97ee8cdf2a70b35134429b211443
2021-06-16 12:25:56 +00:00
Junyu Lai
8aa17e2a6a
Merge changes I627dcd0f,I81abc174,Id7948d21 am: 75090fb64e am: 93b8b38683
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731450
Change-Id: I5588db4e540440e08f62c90d7369fb308a02b2f6
2021-06-16 12:14:22 +00:00
Chiachang Wang
901eeb201d
Add test for CM#setAcceptUnvalidated
...
The always bit is verified in NetworkAgentTest. There is no easy
configuration to set an explicitly selected network to accept an
unvalidated network. Verify the accepted case also in
NetworkAgentTest.
Bug: 186061922
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCasesLatestSdk
Change-Id: I803eb975fb0b6c52d55b2310293bcad407d21f42
2021-06-16 20:09:08 +08:00
Chiachang Wang
589105d385
Add test for CM#setAcceptPartialConnectivity
...
Bug: 186061922
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCasesLatestSdk
Change-Id: Iba312defb6f02896eac518d71d36f1ef3df3d00b
2021-06-16 20:06:15 +08:00
Junyu Lai
93b8b38683
Merge changes I627dcd0f,I81abc174,Id7948d21 am: 75090fb64e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731450
Change-Id: I3662e70034b16721e4ad1711654cb9f7eda45d35
2021-06-16 11:59:37 +00:00
Remi NGUYEN VAN
4ca7a11543
Merge "Remove ConnectivityServiceTest signature perms use" am: 54c7434f0d am: 96ad425c5e am: 595dda3604
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736615
Change-Id: I7dd3c5e7da9097ebedd7f4a836d4e78ef9bf08e5
2021-06-16 11:49:54 +00:00
Junyu Lai
75090fb64e
Merge changes I627dcd0f,I81abc174,Id7948d21
...
* changes:
Fix expectCallback does not fail when no callback received
Add CTS for registerBestMatchingNetworkCallback
No-op refactoring of NetworkAgentTest
2021-06-16 11:46:34 +00:00
Remi NGUYEN VAN
595dda3604
Merge "Remove ConnectivityServiceTest signature perms use" am: 54c7434f0d am: 96ad425c5e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736615
Change-Id: Ifd8c397644f5fc680b34905882ec287bb43c1e1b
2021-06-16 11:37:53 +00:00
Remi NGUYEN VAN
96ad425c5e
Merge "Remove ConnectivityServiceTest signature perms use" am: 54c7434f0d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736615
Change-Id: I0f9c3677f135dd48fc73da08661497190f8d3c20
2021-06-16 11:24:51 +00:00
Remi NGUYEN VAN
54c7434f0d
Merge "Remove ConnectivityServiceTest signature perms use"
2021-06-16 11:09:05 +00:00
Remi NGUYEN VAN
c9c745f2f2
Make tests compatible with mockito-extended
...
This does not change the mockito library to use mockito-extended in
FrameworksNetTests, but changes the tests so that they would pass if
built against that library.
This is useful to run FrameworksNetTests in a common test suite with
other tests that use mockito-extended, for example a common connectivity
coverage test target.
The change includes increasing the test timeout in
ConnectivityServiceTest, as mockito-extended can have performance impact
(~3 times on hwasan builds). This change does not make tests run slower
in the current FrameworksNetTests suite though.
Bug: 187935317
Test: atest FrameworksNetTests
Change-Id: I61fa371e8957037075a2617a014647ff062207c6
2021-06-16 17:53:08 +09:00
Remi NGUYEN VAN
18a979fa41
Remove ConnectivityServiceTest signature perms use
...
To allow unit tests to run without platform certificates, remove
signature permission usage in ConnectivityServiceTest.
This mocks permission checks done in ConnectivityService for which the
test assumed that the permission was held, and mocks calls to
BatteryStatsManager. Calls to ActivityManagerService (through
PendingIntent) are done with shell permissions as the test uses real
PendingIntent mechanics.
Bug: 187935317
Test: atest FrameworksNetTests
Change-Id: If309d653ac2e9bbcf1b94bcee6336367289df359
2021-06-16 16:32:03 +09: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
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