Merge "Add CTS for setProfileNetworkPreference" am: 5d4f701244 am: 106a4752f7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733784
Change-Id: Ib5b529b38eb05c33d2b85ca9a8da3f6a4915125b
Treehugger Robot
authored and
Automerger Merge Worker
commited 2021-06-21 10:34:59 +00:00
9bb6c1958d
Merge "Add CTS for setProfileNetworkPreference"
Treehugger Robot
authored and
Gerrit Code Review
commited 2021-06-21 10:25:05 +00:00
5d4f701244
Merge "CTS test for PacProxyManager" am: b93396edfb am: 7320aefbdd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705131
Change-Id: I91bd40cd58c325d0b8d8f016739c07021346024d
Aaron Huang
authored and
Automerger Merge Worker
commited 2021-06-21 10:14:45 +00:00
a7aafd628f
Merge "CTS test for PacProxyManager"
Aaron Huang
authored and
Gerrit Code Review
commited 2021-06-21 09:42:33 +00:00
b93396edfb
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: I21303da985c19f1d9682ed215bca3dcaf9fed807
Chiachang Wang
authored and
Automerger Merge Worker
commited 2021-06-16 15:39:18 +00:00
c6483aaf30
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: I5289c072eaf50ef9090549f31537f1fffcf2f160
Chiachang Wang
authored and
Automerger Merge Worker
commited 2021-06-16 15:39:11 +00:00
aa3cbdaba6
Merge "Add test for CM#setAcceptUnvalidated" am: 27586f8210
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731234
Change-Id: I524644366a398b34de8f659d0d0d275f3f513c0c
Chiachang Wang
authored and
Automerger Merge Worker
commited 2021-06-16 15:29:47 +00:00
d6d3bf0b89
Merge "Add test for CM#setAcceptPartialConnectivity" am: 2693dc2696
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730545
Change-Id: I702a17935b7e0a29d5c45e5ae6bd7ccf3c76eccd
Chiachang Wang
authored and
Automerger Merge Worker
commited 2021-06-16 15:29:37 +00:00
98e8422124
Merge "Add test for CM#setAcceptUnvalidated"
Chiachang Wang
authored and
Gerrit Code Review
commited 2021-06-16 15:17:51 +00:00
27586f8210
Merge "Add test for CM#setAcceptPartialConnectivity"
Chiachang Wang
authored and
Gerrit Code Review
commited 2021-06-16 15:17:37 +00:00
2693dc2696
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: I56fcd6452a072d4d6af2f1e81739be5f7f00670a
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2021-06-16 13:56:03 +00:00
16bbc032c3
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
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2021-06-16 13:34:34 +00:00
c3d789bff1
Merge "Make tests compatible with mockito-extended"
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2021-06-16 13:22:37 +00:00
ad7108ce34
Merge changes I627dcd0f,I81abc174,Id7948d21 am: 75090fb64e am: 93b8b38683
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731450
Change-Id: Ib9a23a64e4a4f423e586ddbd3644a1314479896b
Junyu Lai
authored and
Automerger Merge Worker
commited 2021-06-16 12:14:31 +00:00
f86173bf71
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
Chiachang Wang
commited 2021-06-16 20:09:08 +08:00
901eeb201d
Add test for CM#setAcceptPartialConnectivity
...
Bug: 186061922
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCasesLatestSdk
Change-Id: Iba312defb6f02896eac518d71d36f1ef3df3d00b
Chiachang Wang
commited 2021-06-16 20:06:15 +08:00
589105d385
Merge changes I627dcd0f,I81abc174,Id7948d21 am: 75090fb64e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731450
Change-Id: I3662e70034b16721e4ad1711654cb9f7eda45d35
Junyu Lai
authored and
Automerger Merge Worker
commited 2021-06-16 11:59:37 +00:00
93b8b38683
Merge changes I627dcd0f,I81abc174,Id7948d21
...
* changes:
Fix expectCallback does not fail when no callback received
Add CTS for registerBestMatchingNetworkCallback
No-op refactoring of NetworkAgentTest
Junyu Lai
authored and
Gerrit Code Review
commited 2021-06-16 11:46:34 +00:00
75090fb64e
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: I1e264659c1cd6d88a669524af8ceacb5c6c05105
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2021-06-16 11:38:00 +00:00
a08680a505
Merge "Remove ConnectivityServiceTest signature perms use" am: 54c7434f0d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1736615
Change-Id: I0f9c3677f135dd48fc73da08661497190f8d3c20
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2021-06-16 11:24:51 +00:00
96ad425c5e
Merge "Remove ConnectivityServiceTest signature perms use"
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2021-06-16 11:09:05 +00:00
54c7434f0d
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
Remi NGUYEN VAN
commited 2021-06-16 17:53:08 +09:00
c9c745f2f2
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
Remi NGUYEN VAN
commited 2021-06-16 16:32:03 +09:00
18a979fa41
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: If1ba493cf69ec669ccaa6acc5cfdba0c0b491fac
Lucas Lin
authored and
Automerger Merge Worker
commited 2021-06-16 04:22:27 +00:00
1648854e8b
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
Lucas Lin
authored and
Automerger Merge Worker
commited 2021-06-16 04:00:13 +00:00
1ed1f3fcf8
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: I584fca1ed9706c16b1fc3acc1937ccf7c0b0e4bb
Chiachang Wang
authored and
Automerger Merge Worker
commited 2021-06-16 02:35:08 +00:00
c12ab4e573
Merge "Add a test to check if the VPN type is set or not"
Lucas Lin
authored and
Gerrit Code Review
commited 2021-06-16 02:22:45 +00:00
3b7c0749d5
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
Chiachang Wang
authored and
Automerger Merge Worker
commited 2021-06-16 02:06:37 +00:00
c60aab0243
Merge "Ignore testFactoryReset in instant app mode"
Chiachang Wang
authored and
Gerrit Code Review
commited 2021-06-16 01:49:51 +00:00
f3283e6b93
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: I11508c995b4bcea63571ac8042e6a9794c9b35d4
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2021-06-16 01:30:01 +00:00
6f41b2d542
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: I1b13784797d2b1326d4ae31d813cc6332101c532
James Mattis
authored and
Automerger Merge Worker
commited 2021-06-16 01:29:56 +00:00
73bdd21f0a
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
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2021-06-16 01:11:33 +00:00
f9eb2c7b0b
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
James Mattis
authored and
Automerger Merge Worker
commited 2021-06-16 01:11:26 +00:00
6c54d5e4c4
Merge changes from topic "per-app-cts"
...
* changes:
CTS tests for setOemNetworkPreference
Update CS so that per-app OEM APIs can be tested
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2021-06-16 00:47:06 +00:00
5f78e30839
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
James Mattis
commited 2021-06-15 12:35:18 -07:00
db143f99cf
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: Ifed846754f00184fb9b5f3e49c1600d1558749c0
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2021-06-15 15:30:59 +00:00
bb9af7edef
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: I32d8d6f2dd6bf9cba23ef52f39e5cd50892e7338
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2021-06-15 15:30:53 +00:00
d4b08110e6
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
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2021-06-15 15:14:30 +00:00
ff949864da
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
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2021-06-15 15:13:18 +00:00
61cad6e216
Merge "Cleanup commit to remove @SkipPresubmit and fix nits"
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2021-06-15 14:54:07 +00:00
81ede794c7
Merge "Verify kernel implementation of AES-CMAC"
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2021-06-15 14:53:36 +00:00
a1363cbd82
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: I9d3bf874c5d6f3d8d1d0c09ae152e23caf90d64f
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2021-06-15 13:39:10 +00:00
9ecbee2383
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
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2021-06-15 13:38:58 +00:00
ec110e2e24
Merge "Don't run testGetAllNetworkStateSnapshots in instant app mode"
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2021-06-15 13:29:19 +00:00
b91372a50f
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: Ie3837b6561ccbd99088fba758f792596a66e71e2
Lucas Lin
authored and
Automerger Merge Worker
commited 2021-06-15 09:32:42 +00:00
655a025198
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: I354450b577ffb6ccfb1c4c1bd5e3b1c844260be3
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2021-06-15 09:32:37 +00:00
4f2728b8cf
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: I2776ffb781178761d57f0c657b68a2cf2d828cd7
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2021-06-15 09:32:32 +00:00
73371c49a0
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
Lucas Lin
authored and
Automerger Merge Worker
commited 2021-06-15 09:28:16 +00:00
f7aa7c51ee
Merge "Send a proxy broadcast when apps moved from/to a VPN"
Lucas Lin
authored and
Gerrit Code Review
commited 2021-06-15 09:26:21 +00:00
cfc86ef0f6
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
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2021-06-15 09:20:10 +00:00
6c08a1824b