Commit Graph

3229 Commits

Author SHA1 Message Date
Hui Yu
1b66dab4ec Merge "Make sure app_idle_constants is set during setup." into qt-dev am: dc7e2bb71c
am: a6bb88ebc1

Change-Id: I36629e515d77aec5ab5770fdebccbda1f543ca9c
2019-05-03 12:41:59 -07:00
Kweku Adams
e811b50460 Merge "Testing Data Saver changed broadcast on unsupported devices." into qt-dev am: 42f325acb9
am: eb7b9bab13

Change-Id: I9b3d6760ac27cf30d818fe44788f9375e6683022
2019-05-03 11:03:55 -07:00
Hui Yu
a6bb88ebc1 Merge "Make sure app_idle_constants is set during setup." into qt-dev
am: dc7e2bb71c

Change-Id: Id524c3206efbc09ecf422b837b92891c8baafde5
2019-05-03 09:34:37 -07:00
Kweku Adams
eb7b9bab13 Merge "Testing Data Saver changed broadcast on unsupported devices." into qt-dev
am: 42f325acb9

Change-Id: If94305b8d2a8b877af585f0c209538b2b2827a7a
2019-05-03 07:52:00 -07:00
Roshan Pius
9808b8d444 Merge "WifiManagerTest: Allow NETWORK_SETTINGS for apps with BIND_QUICK_SETTINGS_TILE" into qt-dev am: 026e9c3e77
am: a856348e4c

Change-Id: I0afc0b8530c8d7ec2d14b615da84d0480c19b1d6
2019-05-03 05:15:12 -07:00
Roshan Pius
a856348e4c Merge "WifiManagerTest: Allow NETWORK_SETTINGS for apps with BIND_QUICK_SETTINGS_TILE" into qt-dev
am: 026e9c3e77

Change-Id: I0b8d13199fe4d3df33100fc9cf5f6f6c8b6aa676
2019-05-03 04:32:17 -07:00
Hui Yu
dc7e2bb71c Merge "Make sure app_idle_constants is set during setup." into qt-dev 2019-05-02 22:51:17 +00:00
Kweku Adams
42f325acb9 Merge "Testing Data Saver changed broadcast on unsupported devices." into qt-dev 2019-05-02 22:14:37 +00:00
Roshan Pius
5dea0afd70 WifiManagerTest: Allow NETWORK_SETTINGS for apps with BIND_QUICK_SETTINGS_TILE
Bug: 130199973
Test: atest WifiManagerTest
Change-Id: Ia31a56ba5fadb52fd724a7d213116cb0f1d0407a
2019-05-02 16:42:55 +00:00
Jack Yu
269c1631e3 Merge "Allow NFC to grant NETWORK_SETTINGS permission" into qt-dev am: 5b80d31a46
am: 86398e2699

Change-Id: I70f88a66065dde19c4ebf63e7f552b867d69a33c
2019-05-01 13:11:45 -07:00
Jack Yu
86398e2699 Merge "Allow NFC to grant NETWORK_SETTINGS permission" into qt-dev
am: 5b80d31a46

Change-Id: Id1567d18da2c534cc6800b210f1b3a10caf2c8ca
2019-04-30 22:39:18 -07:00
Sasha Smundak
3b813125f9 Merge "Convert hostsidetests/net/**/Android.mk file to Android.bp" am: 9bca8f5c35 am: 69de989faf
am: 153173af0b

Change-Id: I8b9bd4878421b75f07809aeca51fd21e042681a2
2019-04-30 11:58:43 -07:00
TreeHugger Robot
5b80d31a46 Merge "Allow NFC to grant NETWORK_SETTINGS permission" into qt-dev 2019-04-30 18:54:53 +00:00
Sasha Smundak
153173af0b Merge "Convert hostsidetests/net/**/Android.mk file to Android.bp" am: 9bca8f5c35
am: 69de989faf

Change-Id: I9a37e90afe4f6682187f9c5937cc552067ab9f7c
2019-04-30 10:36:46 -07:00
Sasha Smundak
69de989faf Merge "Convert hostsidetests/net/**/Android.mk file to Android.bp"
am: 9bca8f5c35

Change-Id: I45955562531b79d6601422d0d246fdbcad14bba3
2019-04-30 10:27:23 -07:00
Lorenzo Colitti
9788e717a0 Merge "Merge "Add instant and ABI XML tags for hostside networking tests." into qt-dev am: 6a8d2df7b7" into qt-dev-plus-aosp
am: 1ba5da3739

Change-Id: I7d7dd30d11c5dc1a6ca205b77084f0605f2e6af6
2019-04-30 05:18:16 -07:00
Lorenzo Colitti
456ac49952 Merge "Add instant and ABI XML tags for hostside networking tests." into qt-dev
am: 6a8d2df7b7

Change-Id: I16544b99efb12ee804a09be3d0d2f53847c11fe0
2019-04-30 04:12:54 -07:00
Sasha Smundak
b3af5c95b2 Convert hostsidetests/net/**/Android.mk file to Android.bp
See build/soong/README.md for more information.

Bug: 122332514
Test: atest CtsHostsideNetworkTests
(same failures as in baseline)
Change-Id: I5b6a22263331b19570b42f156d7ad5d59f8208b4
2019-04-29 13:18:42 -07:00
Kweku Adams
3a88dd4732 Testing Data Saver changed broadcast on unsupported devices.
Bug: 114131539
Test: atest com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Change-Id: I3e8f9297ca49ee86bd26bb3d7a094c38b6203118
2019-04-29 11:25:14 -07:00
Hui Yu
022058ec74 Make sure app_idle_constants is set during setup.
Set app_idle_constants in NetPolicyTestsPreparer is not always successful(suspect timing issue).
Set app_idle_constants in AbstractRestrictBackgroundNetworkTestCase again to make sure.

Bug: 115393390
Test: atest com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testAppIdleMetered_whenCharging

Change-Id: I41148bc7eea0825537133f0471ceefeb5b05d763
2019-04-26 17:07:34 -07:00
Lorenzo Colitti
5abd1ff346 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
(cherry picked from commit ad17ee9e92)
2019-04-26 12:52:28 -07:00
Jack Yu
7457cd2728 Allow NFC to grant NETWORK_SETTINGS permission
There is use cases in NFC that need this permission.

Bug:131195124
Test: Cts pass after NFC app add NETWORK_SETTINGS permission
Change-Id: Iec5a08721da43767cfd0ced51e73a1b757b0d97a
2019-04-26 11:49:45 +08:00
Luke Huang
db29b055d9 Merge "Convert Android.mk to Android.bp for net cts" am: b2ba69080c am: e6a6c9e68f
am: 2890f04eaf

Change-Id: I5bb6de7a07494bd13d069212223691968d4f080e
2019-04-24 21:27:40 -07:00
Luke Huang
2890f04eaf Merge "Convert Android.mk to Android.bp for net cts" am: b2ba69080c
am: e6a6c9e68f

Change-Id: I90f1b3d41e956abbd1106403d8d1d176e23caa99
2019-04-24 20:26:09 -07:00
Luke Huang
e6a6c9e68f Merge "Convert Android.mk to Android.bp for net cts"
am: b2ba69080c

Change-Id: Ib06cf43d108e74a52c539e9113a2ea6f9937a8c2
2019-04-24 20:20:21 -07:00
Luke Huang
4df605b6a4 Convert Android.mk to Android.bp for net cts
Bug: 130623306
Test: atest CtsNativeNetTestCases CtsNativeNetDnsTestCases
      atest CtsNetTestCases

Change-Id: Ifc69f6f83161a44b663e6afdf034963ad241a6b5
2019-04-23 09:27:27 +00:00
Chalard Jean
1db13af0c9 [automerger skipped] Merge "Add a test for a bugfix in UrlQuerySanitizer" into qt-dev am: 340b6af4a1 -s ours
am: 4ca03bfd4f -s ours
am skip reason: change_id Iba7ed3fe8cb23d7d14a29f2259a08e9c833db146 with SHA1 a29a167fcc is in history

Change-Id: Iee5d74aa3a580cfcb6631ea8c40c9b4cc6024962
2019-04-23 00:29:32 -07:00
Chalard Jean
4ca03bfd4f [automerger skipped] Merge "Add a test for a bugfix in UrlQuerySanitizer" into qt-dev
am: 340b6af4a1 -s ours
am skip reason: change_id I10882b8d9a62766acfff6ec18afb3d813c631fd3 with SHA1 0114b8482d is in history

Change-Id: Ie5ba4e77fa65a43d5e5680184e9d0ddb17986df2
2019-04-23 00:18:41 -07:00
Chalard Jean
221ac7cdb2 Add a test for a bugfix in UrlQuerySanitizer
...so this does not happen again.
This is a test for the fix in Ic91660d974dce21f2affdcacaeffe9accf8451ac

Bug: 1866121
Test: This
Change-Id: Ib7ee866f65baf99b46a31e2115355a42a829421e
(cherry picked from commit d60c09fd4db5deb81900af5208cc9306e2f77b3b)
Merged-In: Iba7ed3fe8cb23d7d14a29f2259a08e9c833db146
Merged-In: I10882b8d9a62766acfff6ec18afb3d813c631fd3
2019-04-23 05:35:17 +00:00
Chalard Jean
a29a167fcc Merge "Add a test for a bugfix in UrlQuerySanitizer" am: 7e14f42570 am: 46c238d8ed
am: 0114b8482d

Change-Id: Iba7ed3fe8cb23d7d14a29f2259a08e9c833db146
2019-04-22 20:54:28 -07:00
Chalard Jean
0114b8482d Merge "Add a test for a bugfix in UrlQuerySanitizer" am: 7e14f42570
am: 46c238d8ed

Change-Id: I10882b8d9a62766acfff6ec18afb3d813c631fd3
2019-04-22 20:04:55 -07:00
Chalard Jean
46c238d8ed Merge "Add a test for a bugfix in UrlQuerySanitizer"
am: 7e14f42570

Change-Id: I7a72ee29f753ea8943ca4b6fc8c0c68775e09df1
2019-04-22 19:51:28 -07:00
Chalard Jean
83e71f6401 Add a test for a bugfix in UrlQuerySanitizer
...so this does not happen again.
This is a test for the fix in Ic91660d974dce21f2affdcacaeffe9accf8451ac

Bug: 1866121
Test: This
Change-Id: Ib7ee866f65baf99b46a31e2115355a42a829421e
2019-04-22 21:58:46 +09:00
Varun Anand
ac2eeb6a43 [automerger skipped] Merge "CTS tests related to VPN meteredness." into qt-dev am: 4d9b8033fe -s ours
am: 8a648bde06 -s ours
am skip reason: change_id I3030e5468a55bbc32be2a753f098dcf7f0256af8 with SHA1 d1008aa730 is in history

Change-Id: I008438613cf9e264ffbf5bbf5872ead50b5a68c5
2019-04-18 18:05:27 -07:00
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
0d82068f78 Merge "CTS tests related to VPN meteredness." am: 1806a7da53 am: dd6406d69d
am: 7973b17dd7

Change-Id: I385cb6b268b23f6865f4c1cf5d46d181fa043f30
2019-04-15 07:17:21 -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
a2f73df47b Merge "Minor changes for DnsResolverTest" am: e445f54934 am: c8ecc806ad
am: 951a9afb48

Change-Id: Ibe5b5396d7d7563643eae14940934786903a4f64
2019-04-12 13:19:52 -07: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
3becfa3ef0 [automerger skipped] Merge "DnsResolver cts changes to match API council requests" into qt-dev am: 501d2d909d -s ours
am: 68beb4fb51 -s ours
am skip reason: change_id I42df921cc3bb01ea25a671d5a1af678a6d3f5872 with SHA1 8999684430 is in history

Change-Id: I7e365c4fc04f1ed0b4fa7e2f002a4346988208f3
2019-04-12 09:53:25 -07: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
5742bf8ff7 Merge "DnsResolver cts changes to match API council requests" am: ea5e4a5409 am: 8999684430
am: 7b73ea2972

Change-Id: I3a35f1ecc746453058089077181650464d263025
2019-04-12 06:14:56 -07:00
Lorenzo Colitti
0d7705ea9c Merge "Add instant and ABI XML tags for hostside networking tests." am: 75c73cda26 am: c40bdf2fce
am: 72914e4469

Change-Id: I1de487d0f4045e47fde354d9f2033e8e2652a3f8
2019-04-12 06:11:15 -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