Commit Graph

3173 Commits

Author SHA1 Message Date
Varun Anand
8a648bde06 [automerger skipped] Merge "CTS tests related to VPN meteredness." into qt-dev
am: 4d9b8033fe -s ours
am skip reason: change_id I3030e5468a55bbc32be2a753f098dcf7f0256af8 with SHA1 d1008aa730 is in history

Change-Id: I9e22c96bea786451df4637c565c8375c3757da24
2019-04-18 17:55:42 -07:00
Varun Anand
5d3ac8f9e1 CTS tests related to VPN meteredness.
(cherry picked from commit d1008aa730)

Tests cover scenarios related to whether VPN has explicitly declared its
underlying networks plus whether it is an always metered VPN.

For each of these scenarios, we ensure VPN meteredness based on its
capabilities and ConnectivityManager#isActiveNetworkMetered matches.

Bug: 123727651
Test: atest HostsideVpnTests

Change-Id: I2dea70c1c432d05b1a22c945f1e3e17166e4132d
Merged-In: I3030e5468a55bbc32be2a753f098dcf7f0256af8
2019-04-15 07:55:58 -07:00
Varun Anand
7973b17dd7 Merge "CTS tests related to VPN meteredness." am: 1806a7da53
am: dd6406d69d

Change-Id: I87ddf706b507fc0c9f8004b130b555c3905d99b1
2019-04-15 07:11:29 -07:00
Varun Anand
dd6406d69d Merge "CTS tests related to VPN meteredness."
am: 1806a7da53

Change-Id: Icfe2f2c2cdaa4e49180c02f3137a0969aa6884d8
2019-04-15 07:05:51 -07:00
Varun Anand
1806a7da53 Merge "CTS tests related to VPN meteredness." 2019-04-15 13:45:57 +00:00
Luke Huang
951a9afb48 Merge "Minor changes for DnsResolverTest" am: e445f54934
am: c8ecc806ad

Change-Id: I3b9eab390a476805eca35c5ae49d6516465f2699
2019-04-12 10:59:13 -07:00
Luke Huang
c8ecc806ad Merge "Minor changes for DnsResolverTest"
am: e445f54934

Change-Id: I176d2e3538d20acef4e04f082735b55c5cca07e6
2019-04-12 10:50:04 -07:00
Treehugger Robot
e445f54934 Merge "Minor changes for DnsResolverTest" 2019-04-12 17:24:36 +00:00
Luke Huang
68beb4fb51 [automerger skipped] Merge "DnsResolver cts changes to match API council requests" into qt-dev
am: 501d2d909d -s ours
am skip reason: change_id I42df921cc3bb01ea25a671d5a1af678a6d3f5872 with SHA1 8999684430 is in history

Change-Id: Id63d0d8f5d75b22a1d80b1d10b097a0f689aa261
2019-04-12 08:52:16 -07:00
Luke Huang
7b73ea2972 Merge "DnsResolver cts changes to match API council requests" am: ea5e4a5409
am: 8999684430

Change-Id: I1a94c563c19b5db0a3339f1420e9552934b0b4d6
2019-04-12 05:47:24 -07:00
Lorenzo Colitti
72914e4469 Merge "Add instant and ABI XML tags for hostside networking tests." am: 75c73cda26
am: c40bdf2fce

Change-Id: I82ad420b23f4c332d0463e154c135e19081cba98
2019-04-12 05:44:24 -07:00
Luke Huang
a0e4104e81 DnsResolver cts changes to match API council requests
Bug: 129261432
Test: atest DnsResolverTest

Merged-In: I42df921cc3bb01ea25a671d5a1af678a6d3f5872
(cherry picked from commit 8999684430)

Change-Id: Ibcb92ac23cf413322234bba9100293ab794cf50e
2019-04-12 06:21:07 +00:00
Luke Huang
f1dc4d4380 Minor changes for DnsResolverTest
Done for code-style nits from aosp/940128.

Bug: 129395490
Test: atest DnsResolverTest
Change-Id: Ia4db272cc1a4687b3749116375bac0efb37420d8
2019-04-12 10:34:14 +08:00
Luke Huang
8999684430 Merge "DnsResolver cts changes to match API council requests"
am: ea5e4a5409

Change-Id: I42df921cc3bb01ea25a671d5a1af678a6d3f5872
2019-04-11 17:57:03 -07:00
Luke Huang
ea5e4a5409 Merge "DnsResolver cts changes to match API council requests" 2019-04-12 00:45:18 +00:00
Lorenzo Colitti
c40bdf2fce Merge "Add instant and ABI XML tags for hostside networking tests."
am: 75c73cda26

Change-Id: Ibff6db948fe3a8ada9da6ac5bca334e85a75e4d9
2019-04-11 16:59:45 -07:00
Lorenzo Colitti
75c73cda26 Merge "Add instant and ABI XML tags for hostside networking tests." 2019-04-11 23:52:10 +00:00
Varun Anand
d1008aa730 CTS tests related to VPN meteredness.
Tests cover scenarios related to whether VPN has explicitly declared its
underlying networks plus whether it is an always metered VPN.

For each of these scenarios, we ensure VPN meteredness based on its
capabilities and ConnectivityManager#isActiveNetworkMetered matches.

Bug: 123727651
Test: atest HostsideVpnTests
Change-Id: I3030e5468a55bbc32be2a753f098dcf7f0256af8
2019-04-11 14:32:21 -07:00
Adam Vartanian
8233c3d9cb [automerger skipped] Add test for SslError.getCertificate()
am: 49a2918a96 -s ours
am skip reason: change_id I1b23746865a4bffc90847b30384defd2c7d49879 with SHA1 5227dbe606 is in history

Change-Id: Iebc4fe75214def3f80b367292a8a0c177b941fbf
2019-04-11 06:09:30 -07:00
Adam Vartanian
49a2918a96 Add test for SslError.getCertificate()
Bug: 129200144
Test: cts -m CtsNetTestCases -t android.net.http.cts
Change-Id: I1b23746865a4bffc90847b30384defd2c7d49879
Merged-In: I1b23746865a4bffc90847b30384defd2c7d49879
(cherry picked from commit befb9b0798)
2019-04-11 11:55:38 +00:00
Lorenzo Colitti
ad17ee9e92 Add instant and ABI XML tags for hostside networking tests.
These are not multi-ABI because the behaviour does not depend on
the ABI of the app. Some of the APIs are ultimately backed by JNI
code in the system server, but that only depends on the system
server's ABI, not the app's.

Enable instant mode because these applications are subject to the
same network restrictions as other apps.

Fix: 123364589
Test: atest CtsHostsideNetworkTests
Test: cts-tradefed run commandAndExit cts --enable-parameterized-modules --module-parameter instant_app -m CtsHostsideNetworkTests
Change-Id: Ib3c4cd365ffe95889d51a236f035ea84516f0abd
2019-04-11 20:43:59 +09:00
Adam Vartanian
befb9b0798 Merge "Add test for SslError.getCertificate()" am: 6ddb09cf3f
am: 6d8d727f92

Change-Id: Ia2684150a5efba47ec7374de9189410e2f40ca6f
2019-04-10 19:45:06 -07:00
Adam Vartanian
6d8d727f92 Merge "Add test for SslError.getCertificate()"
am: 6ddb09cf3f

Change-Id: I6d1ed99c2719d1a4f32fdbb08faca611909c1e18
2019-04-10 05:57:52 -07:00
Luke Huang
4b1fab0dd0 DnsResolver cts changes to match API council requests
Bug: 129261432
Test: atest DnsResolverTest
Change-Id: I803f10218a01614ba7fb26597971853e602273c6
2019-04-10 15:39:21 +08:00
Adam Vartanian
5227dbe606 Add test for SslError.getCertificate()
Bug: 129200144
Test: cts -m CtsNetTestCases -t android.net.http.cts
Change-Id: I1b23746865a4bffc90847b30384defd2c7d49879
2019-04-09 15:46:20 +01:00
Lorenzo Colitti
1fe047bf4c Merge "[automerger skipped] Merge "Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev am: d93f6d545c" into pie-cts-dev am: f9b246a320 -s ours am: 8f755d309d -s ours
am: 66bfb3a8a3 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I8ac32f9c4e70a5d0d128c93a881a97bf834bdba5
2019-04-09 05:58:11 -07:00
saurav subedi
9554a943c9 Merge "[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into pie-cts-dev am: 9709b60914 -s ours am: 40ac51693b -s ours
am: c3aea57c53 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie1564a0faa30963fcdd2202489b0500e7706a09d
2019-04-09 04:53:59 -07:00
Remi NGUYEN VAN
95b8c02e51 Merge "Add FrameworksNetCommonTests to CTS" into qt-dev
am: 0327575fad

Change-Id: I7b5bb985bfc711a3697a596f1d43864e6bcc9b7b
2019-04-08 23:36:24 -07:00
Lorenzo Colitti
c6951c7b63 [automerger skipped] Merge "Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev am: d93f6d545c" into pie-cts-dev am: f9b246a320 -s ours am: b54262d012 -s ours
am: 97c67cbbbd -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I33d2c315c37a74dd097a90c404bd8c130c2981bb
2019-04-08 23:32:45 -07:00
Lorenzo Colitti
5602efd366 Merge "[automerger skipped] Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev am: d93f6d545c -s ours am: b8e0be9df1 -s ours am: 151652e818 -s ours
am: 8a865b6efa -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I7d9753d41c1824c1f84879a4a217194df86b3b3e
2019-04-08 23:22:17 -07:00
Lorenzo Colitti
feadc137b1 [automerger skipped] Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89 -s ours am: c8541fdf00 -s ours am: 255af6675f -s ours am: 31812cb71a -s ours am: c3f02ab985 -s ours
am: 94a9d6277c -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I059114f5439f06bf19befa92443c8581fb917184
2019-04-08 22:51:40 -07:00
Lorenzo Colitti
243d382cf1 [automerger skipped] Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc -s ours am: 15f4a80a93 -s ours am: b4583d97e8 -s ours am: 9fdfe85b32 -s ours am: 57a0d8740c -s ours
am: 08ad6259ad -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I9cf0d61d1d459ac1dfcd01cae7c22873a34085b1
2019-04-08 22:45:43 -07:00
Lorenzo Colitti
6dd7ffd4d7 [automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0 am: 88a48fcbfe am: 9c3250f49c am: 761b3e5e7b am: e7ee057428 am: bc9edb5254 am: 296cfbb29c am: 27bbe03b65 am: ea06420fed -s ours
am: d9ca6f1831 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3852fd92f5 is in history

Change-Id: Icc6ce0a4a493ed3a856f8dd304fbf9151d4eb086
2019-04-08 22:38:25 -07:00
Remi NGUYEN VAN
0327575fad Merge "Add FrameworksNetCommonTests to CTS" into qt-dev 2019-04-09 05:16:29 +00:00
Lorenzo Colitti
97c67cbbbd [automerger skipped] Merge "Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev am: d93f6d545c" into pie-cts-dev am: f9b246a320 -s ours
am: b54262d012 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: Ib19798ab58a3a6c033706aed4a712fc93a93ed13
2019-04-08 21:46:51 -07:00
Lorenzo Colitti
1d5ebfdb15 [automerger skipped] Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev am: d93f6d545c -s ours am: b8e0be9df1 -s ours
am: 151652e818 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I7e7e774bcfe3e6e103b4bcf71a41e944f9012d32
2019-04-08 21:37:43 -07:00
Lorenzo Colitti
66bfb3a8a3 Merge "[automerger skipped] Merge "Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev am: d93f6d545c" into pie-cts-dev am: f9b246a320 -s ours
am: 8f755d309d -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3852fd92f5 is in history

Change-Id: I5a6edd6e8f9216e670edb0e046ffd762fc02da3d
2019-04-08 21:36:12 -07:00
Lorenzo Colitti
94a9d6277c [automerger skipped] Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89 -s ours am: c8541fdf00 -s ours am: 255af6675f -s ours am: 31812cb71a -s ours
am: c3f02ab985 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I487838837d6d205831af7f38aed7a06e15cd9190
2019-04-08 21:32:24 -07:00
Lorenzo Colitti
08ad6259ad [automerger skipped] Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc -s ours am: 15f4a80a93 -s ours am: b4583d97e8 -s ours am: 9fdfe85b32 -s ours
am: 57a0d8740c -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I85522db22dc64a1bae8750e90dd582758f4c1278
2019-04-08 21:27:00 -07:00
Lorenzo Colitti
d9ca6f1831 [automerger skipped] [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0 am: 88a48fcbfe am: 9c3250f49c am: 761b3e5e7b am: e7ee057428 am: bc9edb5254 am: 296cfbb29c am: 27bbe03b65
am: ea06420fed -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3852fd92f5 is in history

Change-Id: I11e54158235688c4d77ebea3a1d6137d3660bac7
2019-04-08 21:21:26 -07:00
Lorenzo Colitti
b54262d012 [automerger skipped] Merge "Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev am: d93f6d545c" into pie-cts-dev
am: f9b246a320 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: Id80d8ca7aa3b52c8edf9c030b28f7ff442b316f7
2019-04-08 20:33:12 -07:00
Android Merger
8f755d309d Merge "[automerger skipped] Merge "Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev am: d93f6d545c" into pie-cts-dev am: f9b246a320 -s ours am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3852fd92f5 is in history" 2019-04-09 03:22:03 +00:00
Lorenzo Colitti
df64089298 [automerger skipped] Merge "Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev am: d93f6d545c" into pie-cts-dev
am: f9b246a320 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3852fd92f5 is in history

Change-Id: I16d2ba7d301964e1beaf261c1b769a05be4a0187
2019-04-08 20:21:53 -07:00
Lorenzo Colitti
151652e818 [automerger skipped] Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev am: d93f6d545c -s ours
am: b8e0be9df1 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I7fce20533f0611736019da80ce55ce30398e8370
2019-04-08 20:15:38 -07:00
Lorenzo Colitti
c3f02ab985 [automerger skipped] Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89 -s ours am: c8541fdf00 -s ours am: 255af6675f -s ours
am: 31812cb71a -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: Id1dd03e1b01dc2744f39934bffafe233658c944a
2019-04-08 20:11:13 -07:00
Lorenzo Colitti
57a0d8740c [automerger skipped] Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc -s ours am: 15f4a80a93 -s ours am: b4583d97e8 -s ours
am: 9fdfe85b32 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I1c0a8f6ede111468f76487ec933efa4c45867db3
2019-04-08 20:06:36 -07:00
Lorenzo Colitti
ea06420fed [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0 am: 88a48fcbfe am: 9c3250f49c am: 761b3e5e7b am: e7ee057428 am: bc9edb5254 am: 296cfbb29c
am: 27bbe03b65

Change-Id: Iead4e85a2b5c6f3c54695f21ab1e952fdc7c99c9
2019-04-08 20:01:58 -07:00
Lorenzo Colitti
b8e0be9df1 [automerger skipped] Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev
am: d93f6d545c -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I1e70eb981896dd2382e67771da0da2eeb1168e69
2019-04-08 19:44:08 -07:00
Android Merger
f9b246a320 Merge "Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev am: d93f6d545c" into pie-cts-dev 2019-04-09 02:38:32 +00:00
Lorenzo Colitti
aaac541459 Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev
am: d93f6d545c

Change-Id: Ie4a894d0d07dd2f26ef63efbb83a4531110f84aa
2019-04-08 19:38:21 -07:00