Rebecca Silberstein
97a50a1348
Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev
...
am: 7bd8640f4d
2018-12-05 21:07:45 -08:00
Android Merger
7bd8640f4d
Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev
2018-12-06 04:45:48 +00:00
Rebecca Silberstein
ac3705bf4c
[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev
...
am: 8c61445473 -s ours
Change-Id: I1581d4da5c0b0ffabb96941a8a416f7012630b80
2018-12-05 20:45:38 -08:00
Roshan Pius
af0963872a
[automerger skipped] resolve merge conflicts of 8c61445473bc2842c8c9490225e97321b65d267c to oc-dev am: 934ff00f93
...
am: 8619176b0c
2018-12-04 20:45:16 -08:00
Roshan Pius
8619176b0c
resolve merge conflicts of 8c61445473bc2842c8c9490225e97321b65d267c to oc-dev
...
am: 934ff00f93
2018-12-04 20:40:44 -08:00
Roshan Pius
934ff00f93
resolve merge conflicts of 8c61445473bc2842c8c9490225e97321b65d267c to oc-dev
...
Bug: 120508352
Change-Id: I43ebc07102d0b765321a4b83c04ff899f2b8ed0c
Merged-In: Id3aaacb3651568c18850a0fdf3832c0f52218cf2
2018-12-05 03:15:07 +00:00
Rebecca Silberstein
af95fad957
WifiManagerTest: allow for multiple modes
...
Now that WifiService can/will support dual simultaneous mode operation, make
sure the tests allow for it as well.
Bug: 31346104
Bug: 115567184
Test: atest android.net.wifi.cts
Change-Id: Id3aaacb3651568c18850a0fdf3832c0f52218cf2
Merged-In: Id3aaacb3651568c18850a0fdf3832c0f52218cf2
2018-11-29 15:24:49 +08:00
saurav subedi
1862b3f6be
[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev
...
am: 4173c4fce5
2018-10-02 12:52:42 -07:00
Treehugger Robot
4173c4fce5
Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev
2018-10-02 19:04:22 +00:00
Rebecca Silberstein
8c71ef4f2e
Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev
...
am: 354de98f9a
Change-Id: I4b8dd8fbb8e4765cba4e95e521f528f6dd752df3
2018-10-01 15:11:57 -07:00
saurav subedi
cd79fb2af6
DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1
...
Devices that don't provide data saver mode must return
RESTRICT_BACKGROUND_STATUS_DISABLED for the
ConnectivityManager#getRestrictBackgroundStatus()
Bug: 116495679
Test: make cts
Change-Id: I81b52c9d26afcf51a7e416d20589c9c7cfb878f6
2018-09-27 21:54:01 +00:00
Rebecca Silberstein
340047b18c
WifiManagerTest: allow for multiple modes
...
Now that WifiService can/will support dual simultaneous mode operation, make
sure the tests allow for it as well.
Bug: 31346104
Bug: 115567184
Test: atest android.net.wifi.cts
Change-Id: Id3aaacb3651568c18850a0fdf3832c0f52218cf2
Merged-In: Id3aaacb3651568c18850a0fdf3832c0f52218cf2
2018-09-18 14:38:54 -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
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
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
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
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
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
Ray Essick
5a9c21fc33
Merge "Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev am: dbfdb95147" into oc-dev am: be259ff997
...
am: b8f58fb9b6
2018-04-09 18:51:42 -07:00
Ray Essick
c8b558b08f
Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours am: 72b96b0354 -s ours" into oc-dev am: 68dc050239
...
am: 6edfe17ca2
2018-04-09 18:46:00 -07:00
Ray Essick
3977adb530
[automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89 am: afef57cad5 am: 1e1b2a7606 am: 9289660d76
...
am: d89cacb7bf
2018-04-09 18:41:41 -07:00
Ray Essick
b8f58fb9b6
Merge "Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev am: dbfdb95147" into oc-dev
...
am: be259ff997
2018-04-09 18:41:09 -07:00
Ray Essick
6e3df95a86
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours skipped: d033198a42 skipped: c550755e79 skipped: 27bbc3628e am: ce176b9ffc
...
am: 56927e7cae
2018-04-09 18:38:48 -07:00
Ray Essick
213fa5b1db
[automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5 am: 02cf01f51c am: 010e44479d am: 790a6f6d52 am: df21617fed
...
am: 14e18f9179
2018-04-09 18:15:47 -07:00
Ray Essick
bff76d3a93
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours skipped: 868997117d skipped: a4cf60e6ea skipped: 8b6d971588 skipped: 63eae3a9e1 skipped: 1a158af55d am: 096c85e4cf
...
am: 591f6ccb9c
2018-04-09 18:13:15 -07:00
Ray Essick
255cbbc39c
[automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f am: c0ca2003bc am: c4691f5ad5 am: d27bde6edf am: c5c83b10ac am: 41c0a7b438 am: a11caf34cc
...
am: 10bed1ef52
2018-04-09 18:08:15 -07:00
Ray Essick
205a892ff5
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours skipped: 151750d842 skipped: d1811f0384 skipped: bbfa5d23a9 skipped: c407f8968b skipped: 6fc9eb97c5 skipped: 973a5cd865 skipped: cd9a559fd2 skipped: 853c5 skipped: c26ea26d31 am: 4d4f3950b6
...
am: 06c461a30b
2018-04-09 18:05:18 -07:00
Ray Essick
6edfe17ca2
Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours am: 72b96b0354 -s ours" into oc-dev
...
am: 68dc050239
2018-04-09 18:01:25 -07:00
Ray Essick
8101a1ba85
[automerger] Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a am: 27b937e5fc am: 8c0df95444 am: 0c19a15081 am: fbc9d49796
...
am: 72405a1736
2018-04-09 18:00:29 -07:00
Ray Essick
089012397b
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours skipped: 1cdd92daaa skipped: 7a92b9afdb skipped: 849e67fad2 am: d2e50eb968
...
am: 66ef84dac4
2018-04-09 17:57:49 -07:00
Ray Essick
d89cacb7bf
[automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89 am: afef57cad5 am: 1e1b2a7606
...
am: 9289660d76
2018-04-09 17:56:53 -07:00
Ray Essick
0fae69ebd7
Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev am: 1c90ff8dcf am: 5b5f73c2e8
...
am: 37ca5b50e8
2018-04-09 17:55:16 -07:00
Ray Essick
56927e7cae
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours skipped: d033198a42 skipped: c550755e79 skipped: 27bbc3628e
...
am: ce176b9ffc
2018-04-09 17:54:49 -07:00
Ray Essick
14e18f9179
[automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5 am: 02cf01f51c am: 010e44479d am: 790a6f6d52
...
am: df21617fed
2018-04-09 17:50:54 -07:00
Ray Essick
591f6ccb9c
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours skipped: 868997117d skipped: a4cf60e6ea skipped: 8b6d971588 skipped: 63eae3a9e1 skipped: 1a158af55d
...
am: 096c85e4cf
2018-04-09 17:48:42 -07:00
Ray Essick
10bed1ef52
[automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f am: c0ca2003bc am: c4691f5ad5 am: d27bde6edf am: c5c83b10ac am: 41c0a7b438
...
am: a11caf34cc
2018-04-09 17:45:03 -07:00
Ray Essick
06c461a30b
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours skipped: 151750d842 skipped: d1811f0384 skipped: bbfa5d23a9 skipped: c407f8968b skipped: 6fc9eb97c5 skipped: 973a5cd865 skipped: cd9a559fd2 skipped: 853c5 skipped: c26ea26d31
...
am: 4d4f3950b6
2018-04-09 17:42:39 -07:00
Ray Essick
72405a1736
[automerger] Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a am: 27b937e5fc am: 8c0df95444 am: 0c19a15081
...
am: fbc9d49796
2018-04-09 17:38:19 -07:00
Ray Essick
6ae132c625
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours am: 308f60a04c -s ours am: c1a7ce019c
...
am: 7a3920dfa4
2018-04-09 17:36:36 -07:00
Ray Essick
66ef84dac4
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours skipped: 1cdd92daaa skipped: 7a92b9afdb skipped: 849e67fad2
...
am: d2e50eb968
2018-04-09 17:36:24 -07:00
Android Build Merger (Role)
6e146b4699
Merge "Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev am: 16af42313d" into oc-mr1-dev
2018-04-10 00:34:26 +00:00
Android Build Merger (Role)
9d36da58e7
Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours am: 72b96b0354 -s ours am: b591008bc2 -s ours" into oc-mr1-dev
2018-04-10 00:34:22 +00:00
Ray Essick
77f5a846d9
Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev
...
am: 16af42313d
2018-04-09 17:34:08 -07:00
Ray Essick
91014e8da2
Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into oc-dev am: 7fc94d02ca
...
am: 52d573a044
2018-04-09 17:33:53 -07:00
Ray Essick
37ca5b50e8
Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev am: 1c90ff8dcf
...
am: 5b5f73c2e8
2018-04-09 17:33:40 -07:00
Ray Essick
644ce499bd
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours am: 72b96b0354 -s ours
...
am: b591008bc2
2018-04-09 17:33:12 -07:00
Ray Essick
7a3920dfa4
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours am: 308f60a04c -s ours
...
am: c1a7ce019c
2018-04-09 17:16:08 -07:00
Android Build Merger (Role)
be259ff997
Merge "Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev am: dbfdb95147" into oc-dev
2018-04-10 00:14:42 +00:00
Android Build Merger (Role)
68dc050239
Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours am: 72b96b0354 -s ours" into oc-dev
2018-04-10 00:14:08 +00:00
Ray Essick
6b4abc5610
Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev
...
am: dbfdb95147
2018-04-09 17:13:42 -07:00
