Commit Graph

2637 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
125c016241 Graphicsstats test modification
am: 250e6324e3

Change-Id: Ib57f6877f215f40b38416d22f4aae779a81e80ee
2018-07-11 17:09:58 -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
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
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
Etan Cohen
eeea3d5510 [RTT][CTS] Add information to assert to help debug failures
Modify the assert message to print out the # of failures and the total
number of iterations. Will help diagnose scope of test failures.

Bug: 109836816
Test: atest WifiRttTest
Change-Id: Ic4d5b6844225edbd9704694c539e31754b7a340c
2018-06-14 08:51:43 -07:00
Xin Li
b7e0399747 Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug: 79597307
Change-Id: I3f596f21ddcf35ca3a33c3f28da2cee4b1e04c25
2018-06-08 11:06:46 -07:00
Lorenzo Colitti
34087e0e40 Wait a few seconds for IPv6 connectivity to appear.
am: 78f8585339

Change-Id: I7aa572eb1dcead0e589a0b194556d732a0bf1e51
2018-06-05 02:31:56 -07:00
Lorenzo Colitti
78f8585339 Wait a few seconds for IPv6 connectivity to appear.
Currently, DnsTest immediately executes a DNS lookup as soon as
it starts. If the device has just connected to a network - as it
might if the test framework has just enabled wifi - and IPv6
connectivity is not yet available, the test will fail with little
proof that the network doesn't have IPv6.

Fix this by waiting for IPv6 connectivity and by adding the
active LinkProperties to the failure message.

Bug: 109670546
Test: DnsTest passes on dual-stack network
Test: DnsTest fails on IPv4-only network
Change-Id: I88b8d001f08fe41af666bccf8094c67729dda9c2
2018-06-05 16:12:41 +09:00
Sudheer Shanka
320a85eaa5 Merge "Update charge level too when turning battery off." into pi-dev
am: 484b49c41b

Change-Id: If5564af2f8238b1f1927ca91fa583468c57c0246
2018-06-01 12:50:58 -07:00
Sudheer Shanka
cd670e7957 Update charge level too when turning battery off.
BATTERY_CHARGING which triggers the parole state
will only be sent if the level is > 90.

Change-Id: I1073e473c27eb5d29744f4a967771392729b4e1a
Fixes:80534062
Test: Verified that updating the level activates the parole mode.
2018-05-31 11:43:40 -07:00
Sudheer Shanka
8157515480 Merge "Update turnBatteryOff to include changing charging status too." into pi-dev
am: 4ca791b07b

Change-Id: I96a16ae67e7186e710323a3f9760df341a647704
2018-05-23 12:01:05 -07:00
Sudheer Shanka
6987d0c61a Merge "CtsHostsideNetworkTests: Skip unsupported tests." into pi-dev
am: b3c2dad1eb

Change-Id: I52c4daca874fc580dcc663dc00ff7234c38bbb18
2018-05-23 10:43:14 -07:00
Sudheer Shanka
4ca791b07b Merge "Update turnBatteryOff to include changing charging status too." into pi-dev 2018-05-23 01:42:05 +00:00
Sudheer Shanka
b3c2dad1eb Merge "CtsHostsideNetworkTests: Skip unsupported tests." into pi-dev 2018-05-23 01:33:08 +00:00
Sudheer Shanka
1b3cc387bf Update turnBatteryOff to include changing charging status too.
AppStandbyController is now listening to BatteryManager.ACTION_CHARGING
for starting parole state and this broadcast won't be sent immediately
after plugging in the device. So, update the charging status too which is
going to trigger this broadcast and parole state can be started
immediately.

Bug: 80109076
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \
      com.android.cts.net.HostsideRestrictBackgroundNetworkTests

Change-Id: I6f19f7a509ec48e96eaea4b188262d5a9735edf1
2018-05-22 14:18:10 -07:00
Sudheer Shanka
926a3cb026 CtsHostsideNetworkTests: Skip unsupported tests.
If appStandby is not enabled, then
testAppIdleAndBatterySaver_tempPowerSaveWhitelists is not supported.

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

Change-Id: I2f4012ff2cf42481e089d7fc33930258e501ddbf
2018-05-22 13:10:50 -07:00
Etan Cohen
8ed21e1c7d Merge "[RTT] Add sanity checks for RTT ranging results" into pi-dev
am: b5aeb0af4a

Change-Id: Ibfdc8e88ed59eb53dd7aa0435ce69dcb5d8f0db3
2018-05-21 17:49:57 -07:00
Etan Cohen
246d3f877d Merge changes from topic "wifi-rtt-cts" into pi-dev
am: 29a32336bd

Change-Id: I9c30879dfed7d1eb003f60adaccf8c4fd5d70e57
2018-05-17 08:47:44 -07:00
Etan Cohen
13c598050a [RTT] Add sanity checks for RTT ranging results
Add checks to validate that the reported number of measurements and
of successes is reasonable: non-zero for successful results.

Bug: 79879905
Test: 'atest WifiRttTest' passes
Change-Id: Ie79b10edacb660dd8c5d116539a4ee5cc32a779d
2018-05-16 15:44:42 -07:00
Etan Cohen
346856ab46 Revert "[RTT] Disable RTT CTS"
This reverts commit 14c32a88c15f2e00647a226c1e670967a683dcf7.

Enable Wi-Fi RTT CTS in production.

Bug: b/74457054
Test: atest CtsNetTestCases:WifiRttTest
Change-Id: Ia60776dbf60406d3665b01c7fecb3c9cd1a6c8ee
2018-05-16 15:31:57 -07:00
Etan Cohen
01d63b603e [RTT] Update CTS to auto-select test AP
Update CTS to select a test AP:
- Scan for APs
- Select the APs supporting IEEE 802.11mc
- Pick the AP with the highest RSSI

Bug: 74518964
Test: atest WifiRttTest (and pick the CTS test)
Change-Id: I6467c75eedcc8260703d2a99214154c9e888cce9
2018-05-16 15:31:57 -07:00
Etan Cohen
b58779a4e1 Revert "[RTT] Modify CTS tests to use associated AP information"
This reverts commit 47d58e2a69.

The revert restores the older method of test AP selction: hard
code the name of the test AP. Subsequent CLs will update to
preferred test AP selection method.

Bug: 74518964
Test: atest WifiRttTest (with rest of CL stack)
Change-Id: Iab71978607aeaf37babdb1afdaeca5c114ccdbf7
2018-05-16 15:31:57 -07:00