Commit Graph

2655 Commits

Author SHA1 Message Date
Sudheer Shanka
1046df1c16 Merge "[automerger skipped] Merge "Use a different key for signing networkpolicy test app." into oreo-mr1-cts-dev am: 4e67a8094e -s ours" into pie-cts-dev am: 352dda391e -s ours am: 9f46420774 -s ours
am: 6cd3c38a57  -s ours

Change-Id: I69b51c897d76a7db114eb5f0eac21a1b2ec65130
2018-08-15 09:00:41 -07:00
Sudheer Shanka
658e673924 Merge "Merge "[automerger skipped] Merge "Use a different key for signing networkpolicy test app." into oreo-mr1-cts-dev am: 4e67a8094e -s ours" into pie-cts-dev am: 352dda391e -s ours" am: fe6ecc7da7 -s ours am: db38ce562a -s ours
am: e62df79dd9  -s ours

Change-Id: I1cd13eb3c3f85ba51aa424c70a0564c572b5aa6d
2018-08-15 08:16:30 -07:00
Sudheer Shanka
9ede5d0267 [automerger skipped] Merge "Use a different key for signing networkpolicy test app." into oreo-mr1-cts-dev am: 4e67a8094e am: 620452f928 -s ours am: ab7977463e -s ours
am: 34a2b60e0e  -s ours

Change-Id: Ia971ea37f702f890a8c63dc0a66264dec0ea2011
2018-08-15 07:22:59 -07:00
Sudheer Shanka
6cd3c38a57 Merge "[automerger skipped] Merge "Use a different key for signing networkpolicy test app." into oreo-mr1-cts-dev am: 4e67a8094e -s ours" into pie-cts-dev am: 352dda391e -s ours
am: 9f46420774  -s ours

Change-Id: Iefbfcf4efb4642362d67114237de7c111212a20b
2018-08-14 22:55:08 -07:00
Sudheer Shanka
e62df79dd9 Merge "Merge "[automerger skipped] Merge "Use a different key for signing networkpolicy test app." into oreo-mr1-cts-dev am: 4e67a8094e -s ours" into pie-cts-dev am: 352dda391e -s ours" am: fe6ecc7da7 -s ours
am: db38ce562a  -s ours

Change-Id: Id3e75cf73c0a18955fff4197698e6c1f88976fba
2018-08-14 22:00:03 -07:00
Sudheer Shanka
db38ce562a Merge "Merge "[automerger skipped] Merge "Use a different key for signing networkpolicy test app." into oreo-mr1-cts-dev am: 4e67a8094e -s ours" into pie-cts-dev am: 352dda391e -s ours"
am: fe6ecc7da7  -s ours

Change-Id: I605a40d9e01f139bfb03df982c13ff2627794eeb
2018-08-14 21:53:07 -07:00
Sudheer Shanka
9f46420774 Merge "[automerger skipped] Merge "Use a different key for signing networkpolicy test app." into oreo-mr1-cts-dev am: 4e67a8094e -s ours" into pie-cts-dev
am: 352dda391e  -s ours

Change-Id: I25b8cd9325becc290e88665c6605fce8ae8b380f
2018-08-14 21:50:36 -07:00
Android Merger
fe6ecc7da7 Merge "Merge "[automerger skipped] Merge "Use a different key for signing networkpolicy test app." into oreo-mr1-cts-dev am: 4e67a8094e -s ours" into pie-cts-dev am: 352dda391e -s ours" 2018-08-15 04:12:36 +00:00
Sudheer Shanka
85f1387349 Merge "[automerger skipped] Merge "Use a different key for signing networkpolicy test app." into oreo-mr1-cts-dev am: 4e67a8094e -s ours" into pie-cts-dev
am: 352dda391e  -s ours

Change-Id: Ic3813b1149ab3cc718e0119794f7a58ea8bdb4dc
2018-08-14 21:12:14 -07:00
Sudheer Shanka
34a2b60e0e [automerger skipped] Merge "Use a different key for signing networkpolicy test app." into oreo-mr1-cts-dev am: 4e67a8094e am: 620452f928 -s ours
am: ab7977463e  -s ours

Change-Id: I860b62928809c2ad9953efa82f7a234c67d3cc02
2018-08-14 20:22:53 -07:00
Sudheer Shanka
ab7977463e [automerger skipped] Merge "Use a different key for signing networkpolicy test app." into oreo-mr1-cts-dev am: 4e67a8094e
am: 620452f928  -s ours

Change-Id: I80eba4adbd24236c0d28fdc54a1568441a5a89cb
2018-08-14 18:54:41 -07:00
Sudheer Shanka
620452f928 Merge "Use a different key for signing networkpolicy test app." into oreo-mr1-cts-dev
am: 4e67a8094e

Change-Id: I874083c9db4dc348e84da9fa6ab151df68efab10
2018-08-14 18:14:28 -07:00
Android Merger
352dda391e Merge "[automerger skipped] Merge "Use a different key for signing networkpolicy test app." into oreo-mr1-cts-dev am: 4e67a8094e -s ours" into pie-cts-dev 2018-08-15 01:05:14 +00:00
Sudheer Shanka
6a2c9ec9bc [automerger skipped] Merge "Use a different key for signing networkpolicy test app." into oreo-mr1-cts-dev
am: 4e67a8094e  -s ours

Change-Id: I1c6594e5255883745690d5977c41ef9c8e529e71
2018-08-14 18:05:07 -07:00
Sudheer Shanka
497a93647c Use a different key for signing networkpolicy test app.
One of the preparation steps for running cts involves loading up the sim
card with the key used to sign CtsCarrierApiTestCases.apk. It
means if the same key is used for signing networkpolicy test app too,
then the app is considered as carrier privileged by the system and can't
be forced into app standby state.

Fixes: 77861812
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \
      com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDataSaverMode_disabled

Change-Id: Iaa9f4fabe83430fa42b6f67c1025db41a5e1d938
Merged-In: Iaa9f4fabe83430fa42b6f67c1025db41a5e1d938
2018-08-09 19:03:23 +00:00
Xin Li
528eae25e8 [automerger skipped] Merge "Merge pie-cts-dev into master." am: e5acef993c am: e68722baa5 -s ours am: 0d10cadd6b
am: 174af3caa4  -s ours

Change-Id: I502bf1e9af106c00c16985cc729ed18001e7963c
2018-08-08 20:52:24 -07:00
Xin Li
0d10cadd6b [automerger skipped] Merge "Merge pie-cts-dev into master." am: e5acef993c
am: e68722baa5  -s ours

Change-Id: I83a0d7c14832397692aa5ad7837dcbd14d5cdaf0
2018-08-08 17:20:29 -07:00
Xin Li
e68722baa5 Merge "Merge pie-cts-dev into master."
am: e5acef993c

Change-Id: I219162ed558e018ea76b8e436fbc273fb4ce8794
2018-08-08 17:03:52 -07:00
Treehugger Robot
e5acef993c Merge "Merge pie-cts-dev into master." 2018-08-08 23:44:12 +00:00
Xin Li
8bf03f3725 Merge pie-cts-dev into master.
Bug: 112051819
Merged-In: I904b9b00a6ef206e75a67a6374fc71d00f64be43
Change-Id: I474fc4c2cc2d4a57b3c781d4b2ac666ebe261450
2018-08-08 19:32:29 +00:00
Xin Li
0b64ba11d2 Merge "Merge Android Pie into master" am: f8c5b15037 am: f9af058801 am: 61736f0b7b
am: 4ef6166a05

Change-Id: I29e1405de6f0c3146434ceec32dc00307c400415
2018-08-08 01:13:05 -07:00
Xin Li
61736f0b7b Merge "Merge Android Pie into master" am: f8c5b15037
am: f9af058801

Change-Id: If3b3ac6e663d38352a8107457abd1e1ff9dbdd56
2018-08-07 17:00:47 -07:00
Xin Li
f9af058801 Merge "Merge Android Pie into master"
am: f8c5b15037

Change-Id: Ie19cd010fa6dd2f67d1fcda2a0491924245f12cb
2018-08-07 13:22:58 -07:00
Adam Vartanian
1a32f52fd6 Merge "CTS test for SslCertificate.getX509Certificate" am: 446150cd66 am: 179a0a0eff am: 9b1b8d3b40
am: 14cc8c2615

Change-Id: I675172ec3381c517dff3cad102c6865c9f58b3da
2018-08-07 11:21:03 -07:00
Adam Vartanian
9b1b8d3b40 Merge "CTS test for SslCertificate.getX509Certificate" am: 446150cd66
am: 179a0a0eff

Change-Id: I5d34c06bc177a5dad365dbe39f85eff206cc3fc2
2018-08-07 10:51:40 -07:00
Xin Li
f8c5b15037 Merge "Merge Android Pie into master" 2018-08-07 16:51:29 +00:00
Adam Vartanian
179a0a0eff Merge "CTS test for SslCertificate.getX509Certificate"
am: 446150cd66

Change-Id: I8b6b95a85396eee7b266f48b4dea94ac5b5e1011
2018-08-07 09:45:04 -07:00
Xin Li
4227c4fc2f Merge Android Pie into master
Bug: 112104996
Change-Id: Icf38c8d11828f219c862aed4dbc35e5fddf716f5
2018-08-06 16:50:02 -07:00
Adam Vartanian
679ee7cbe7 CTS test for SslCertificate.getX509Certificate
Bug: 111696337
Bug: 36984840
Test: cts -m CtsNetTestCases -t android.net.http
Change-Id: I778a18fd3636efc1e60d61e6d2b78685635c07f8
2018-07-30 11:01:43 +01:00
Chenbo Feng
458dc5ab4d Merge "Skip the test if cannot open ctrl file" am: 2ab9867d51 am: ac8ef7ce5c am: afc2ea23dd
am: 4a92ed72a9

Change-Id: I7f27218dbd9f175868553aa1879d71dc12ee1985
2018-07-26 21:28:31 -07:00
Chenbo Feng
fda2040553 Merge "Skip the test if cannot open ctrl file" am: 2ab9867d51
am: ac8ef7ce5c

Change-Id: I79eaf799c9eb8c15418322543f099375ae91ad9b
2018-07-26 21:11:06 -07:00
Chenbo Feng
ac8ef7ce5c Merge "Skip the test if cannot open ctrl file"
am: 2ab9867d51

Change-Id: I813c36ecd545ee73cb05c28e1f444fc229084985
2018-07-26 21:06:31 -07:00
Treehugger Robot
2ab9867d51 Merge "Skip the test if cannot open ctrl file" 2018-07-27 03:48:14 +00:00
Chenbo Feng
cc7747d2de Skip the test if cannot open ctrl file
The shell access to the proc/xt_qtaguid/ctrl file is blocked in next
android release since no apps or users should directly read/write to
those proc files anymore. This CTS test is checking some critical kernel
behavior to make sure the xt_qtaguid module have specific kernel fixes.
So if the ctrl file is not accessible, there is no way to verify those
critical fixes, we can only skipped the test. These testcases are also
added in VTS qtaguid test so we can still check the devices have those
kernel fixes.

Bug: 110906349
Test: atest CtsNativeNetTestCases
Change-Id: Iae0512bb37f8b93577a134f15affb4f2a448be18
2018-07-26 18:53:23 -07:00
Neil Fuller
6303deecf3 Merge "Extend Uri tests" am: 58f6083027 am: 71286682ce am: be22863116
am: c0681a2403

Change-Id: I45a96eb9e8ae0719b6ccfbf280a2dea3f2b06452
2018-07-24 10:22:58 -07:00
Neil Fuller
f71af5169e Merge "Extend Uri tests" am: 58f6083027
am: 71286682ce

Change-Id: I9849d90cbc73a04193daf8ab9fe5ab3c4a03f6d6
2018-07-24 09:23:06 -07:00
Neil Fuller
71286682ce Merge "Extend Uri tests"
am: 58f6083027

Change-Id: I659a205aeaea9910115ce48e98cd858e8e8423b7
2018-07-24 09:12:19 -07:00
Neil Fuller
d8eb370a89 Extend Uri tests
The internal UriCodec class is being removed from libcore/ and the
associated CTS tests are being removed. This change adds equivalent
URI decoding tests to the UriTest CTS test class.

Test: make droid && make cts
Test: run cts-dev -m CtsNetTestCases -t android.net.cts.UriTest
Bug: 111055375
Change-Id: Ided15d5abf8478064d193034e84c4dbe0689c6f0
2018-07-23 19:49:24 +01:00
Alice Sheng
fd7ba749fd Graphicsstats test modification am: 250e6324e3
am: 0bcb6f04b1

Change-Id: I955ff58cea6dcaa86e1c365bea8a68c42ef717ef
2018-07-11 17:38:41 -07:00
Alice Sheng
125c016241 Graphicsstats test modification
am: 250e6324e3

Change-Id: Ib57f6877f215f40b38416d22f4aae779a81e80ee
2018-07-11 17:09:58 -07:00
TreeHugger Robot
e9645a286b Merge "Fixed DuplicateIdActivityTest.testDoNotRestoreDuplicateAutofillIds()" 2018-07-11 20:13:54 +00:00
TreeHugger Robot
c7dba63485 Merge "Update OWNERS file" 2018-07-07 02:22:37 +00:00
Sudheer Shanka
25ddb1d4d0 Merge "Use a different key for signing networkpolicy test app." into pi-dev am: fddb5940a0
am: 5f754c3e91

Change-Id: I3ca7654d9ae967aefd04c060a728aa5ae4939b42
2018-06-29 12:03:36 -07:00
Sudheer Shanka
5f754c3e91 Merge "Use a different key for signing networkpolicy test app." into pi-dev
am: fddb5940a0

Change-Id: I1ecb28aa0393511b9d39229db86d009ea833ce24
2018-06-29 11:58:00 -07:00
Rebecca Silberstein
375ccc286a WifiManagerTest: checks for networking permissions
Add checks for critical networking permissions:
1 - NETWORK_STACK
2 - NETWORK_SETTINGS
3 - NETWORK_SETUP

Bug: 80490622
Test: atest WifiManagerTest
Change-Id: Ifdbb2a9e13a781fe9a3568eef362837af175952b
2018-06-26 10:38:50 -07:00
Etan Cohen
533fed11d8 Update OWNERS file
- Clean-up without functional change: removed name already inherited
  from parent directory.
- Add OWNERS to p2p CtsVerifier

Bug: 110536740
Test: N/A
Change-Id: Iebfe7c4401fcb02163f757a3a1c346eb05222925
2018-06-21 15:28:12 -07:00
Sudheer Shanka
841d4711be Use a different key for signing networkpolicy test app.
One of the preparation steps for running cts involves loading up the sim
card with the key used to sign CtsCarrierApiTestCases.apk. It
means if the same key is used for signing networkpolicy test app too,
then the app is considered as carrier privileged by the system and can't
be forced into app standby state.

Fixes: 80077890
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \
      com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDataSaverMode_disabled

Change-Id: Iaa9f4fabe83430fa42b6f67c1025db41a5e1d938
2018-06-19 19:35:00 -07:00
Etan Cohen
e7689c6262 Merge "[RTT][CTS] Add information to assert to help debug failures" into pi-dev am: ff5ead77e3
am: c5474575fb

Change-Id: Icb9b3638c61151f8cf313beae82bc1102e99b74c
2018-06-18 15:01:13 -07:00
Android Build Merger (Role)
279724e305 [automerger] Merge "[RTT][CTS] Add information to assert to help debug failures" into pi-dev am: ff5ead77e3 am: 93283d9b96
Change-Id: I29c4191679a228c927fddc324150425810a802ba
2018-06-18 21:54:26 +00:00
Etan Cohen
c5474575fb Merge "[RTT][CTS] Add information to assert to help debug failures" into pi-dev
am: ff5ead77e3

Change-Id: I289c3f603ad1c28ea7cee98d483816ec8edf80da
2018-06-18 14:53:41 -07:00