Commit Graph

2659 Commits

Author SHA1 Message Date
saurav subedi
aea9fa1fe5 Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev am: 6cc6a0c703 -s ours" into pie-cts-dev am: 601d7ae0d7 -s ours
am: 8d9fecee8b

Change-Id: I556396945507b5997ab02babca83c1d75ef92a9e
2018-09-06 17:22:22 -07:00
saurav subedi
8d9fecee8b Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev am: 6cc6a0c703 -s ours" into pie-cts-dev
am: 601d7ae0d7  -s ours

Change-Id: I81d36d626fb8f30edc1ab7b1f7b42495a50bf79f
2018-09-06 16:26:01 -07:00
saurav subedi
518da1c897 [automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev am: 6cc6a0c703 -s ours am: bf6ddb73d4 -s ours
am: 80abafd713

Change-Id: Iee75a8f09f3abb54aae66e160973562afb191dad
2018-09-06 14:52:33 -07:00
saurav subedi
80abafd713 [automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev am: 6cc6a0c703 -s ours
am: bf6ddb73d4  -s ours

Change-Id: I076f9db16bdb4bb861429f21ab80889f94100c9c
2018-09-06 14:41:22 -07:00
saurav subedi
bf6ddb73d4 [automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev
am: 6cc6a0c703  -s ours

Change-Id: Ib668ac9a7891dac22b6372b12fee510bea94e121
2018-09-06 14:25:34 -07:00
Android Merger
601d7ae0d7 Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev am: 6cc6a0c703 -s ours" into pie-cts-dev 2018-09-06 21:23:39 +00:00
saurav subedi
48cc401936 [automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev
am: 6cc6a0c703  -s ours

Change-Id: Iea8628f846981b6e607631158367c643c30dda3b
2018-09-06 14:23:32 -07:00
saurav subedi
6943e15b8c DO NOT MERGE: CDD Annotations for Section: 7.4.7
Bug: 112612833

Test: make cts

Change-Id: I7443794296f9364bc0e88e5ba3b717d6c01511a7
2018-09-06 00:42:25 +00:00
saurav subedi
4a63d9911d Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.2" into oreo-mr1-cts-dev am: c91f21fb7e -s ours" into pie-cts-dev am: 76b6ac5e27 -s ours" am: bc6c2016e1 -s ours
am: 9a09819614  -s ours

Change-Id: I412441e9a021f12413153cbca97bb90930177172
2018-08-30 16:30:50 -07:00
saurav subedi
54c7c44cb8 Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.2" into oreo-mr1-cts-dev am: c91f21fb7e -s ours" into pie-cts-dev am: 76b6ac5e27 -s ours
am: 3105765f41

Change-Id: I2a1cac4fbbea0f9cf0191ad9ae1834ef8dfe0ede
2018-08-30 16:11:42 -07:00
saurav subedi
9a09819614 Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.2" into oreo-mr1-cts-dev am: c91f21fb7e -s ours" into pie-cts-dev am: 76b6ac5e27 -s ours"
am: bc6c2016e1  -s ours

Change-Id: Ibc6b7b547d151851509f043d3d990f75ce9d5b2c
2018-08-30 16:07:33 -07:00
saurav subedi
0e9dde690c [automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.2" into oreo-mr1-cts-dev am: c91f21fb7e -s ours am: 78f6cc4bb8 -s ours
am: 312d1ebf3a

Change-Id: Ib79d26e5945dff717944f41a53fb69ae81eccb2a
2018-08-30 16:04:04 -07:00
saurav subedi
3105765f41 Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.2" into oreo-mr1-cts-dev am: c91f21fb7e -s ours" into pie-cts-dev
am: 76b6ac5e27  -s ours

Change-Id: I48f3cf4b6b4f8a764d5cf80142bdf7a228104307
2018-08-30 15:53:57 -07:00
saurav subedi
312d1ebf3a [automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.2" into oreo-mr1-cts-dev am: c91f21fb7e -s ours
am: 78f6cc4bb8  -s ours

Change-Id: I7dc5356564d8d011696ee586e58d0e52e2f398c3
2018-08-30 15:48:18 -07:00
Android Merger
bc6c2016e1 Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.2" into oreo-mr1-cts-dev am: c91f21fb7e -s ours" into pie-cts-dev am: 76b6ac5e27 -s ours" 2018-08-30 22:37:18 +00:00
saurav subedi
7f69a77cb7 Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.2" into oreo-mr1-cts-dev am: c91f21fb7e -s ours" into pie-cts-dev
am: 76b6ac5e27  -s ours

Change-Id: I402170795e173ee58e611e4b4dcc7bf9fddd80af
2018-08-30 15:37:08 -07:00
saurav subedi
78f6cc4bb8 [automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.2" into oreo-mr1-cts-dev
am: c91f21fb7e  -s ours

Change-Id: Idb0f74382c1e63ec68d35d15f32f76d9fc768eff
2018-08-30 15:27:41 -07:00
Android Merger
76b6ac5e27 Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.2" into oreo-mr1-cts-dev am: c91f21fb7e -s ours" into pie-cts-dev 2018-08-30 22:22:15 +00:00
saurav subedi
2a3bb66943 [automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.2" into oreo-mr1-cts-dev
am: c91f21fb7e  -s ours

Change-Id: I3746d5a5a8542b5ef681e4feca695c4cfe6805eb
2018-08-30 15:21:53 -07:00
saurav subedi
54fb25689c DO NOT MERGE: CDD Annotations for Section: 7.4.2
C-1-1: MUST implement the WifiAwareManager APIs as described in the SDK documentation.
--> SingleDeviceTest

C-1-4:MUST randomize the Wi-Fi Aware management interface address at intervals no longer
then 30 minutes and whenever Wi-Fi Aware is enabled
-->SingleDeviceTest#testAttachDiscoveryAddressChanges()

CDD SECTION:7.4.1.1/C-1-1,C-1-3: Wifi Direct
 C-1-1: MUST implement the corresponding Android API as described in the SDK documentation.
 C-1-3: MUST support regular Wi-Fi operation.
--> ConcurrencyTest

7.4.2.4/C-1-1,C-2-1:
C-1-1: MUST implement the Passpoint related WifiManager APIs as described in the SDK documentation.
C-1-2: MUST support IEEE 802.11u standard, specifically related to Network Discovery and Selection,
such as Generic Advertisement Service (GAS) and Access Network Query Protocol (ANQP).
--> Passpoint configuration tests

Added C-0-3 to ConnectivityBackgroundTestActivity as well

CDD VERSION: 8.1: https://source.android.com/compatibility/8.1/android-8.1-cdd

Bug: 112612833

Test: make cts

Change-Id: Ief11b3ae7899bfdca12a7cce63daca600b1f0cdf
2018-08-28 01:45:08 +00: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
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