Roshan Pius
1a62ec8d7c
[automerger skipped] resolve merge conflicts of 8c61445473bc2842c8c9490225e97321b65d267c to oc-dev am: 934ff00f93 am: 8619176b0c -s ours am: af0963872a -s ours am: 4b1354cbd6 -s ours
...
am: b22061a41b -s ours
Change-Id: I2ffa80544221ed60df557d2c62106b24e3b828ec
2018-12-04 21:10:35 -08:00
Roshan Pius
b22061a41b
[automerger skipped] resolve merge conflicts of 8c61445473bc2842c8c9490225e97321b65d267c to oc-dev am: 934ff00f93 am: 8619176b0c -s ours am: af0963872a -s ours
...
am: 4b1354cbd6 -s ours
Change-Id: I68881470e7c0e58cb3b02d26c8ad04b099a9f7be
2018-12-04 20:57:45 -08:00
Roshan Pius
4b1354cbd6
[automerger skipped] resolve merge conflicts of 8c61445473bc2842c8c9490225e97321b65d267c to oc-dev am: 934ff00f93 am: 8619176b0c -s ours
...
am: af0963872a -s ours
Change-Id: I1fa1986f48cffa55c3881f3c20a36c90adcad711
2018-12-04 20:49:59 -08:00
Roshan Pius
af0963872a
[automerger skipped] resolve merge conflicts of 8c61445473bc2842c8c9490225e97321b65d267c to oc-dev am: 934ff00f93
...
am: 8619176b0c -s ours
Change-Id: Ia5d10ee2a42c32632055765d1869801c0ad217c4
2018-12-04 20:45:16 -08:00
Roshan Pius
8619176b0c
resolve merge conflicts of 8c61445473bc2842c8c9490225e97321b65d267c to oc-dev
...
am: 934ff00f93
Change-Id: Ifac1fe67bda37bbbe5fa1d5be19f75ab51f34c8e
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
Roshan Pius
8c9f1ec580
Merge "WifiManagerTest: Remove tests for deprecated API's"
2018-11-29 20:41:19 +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
Kweku Adams
30897c29ef
Tests for app idle whitelisting.
...
Ensuring that app idle network whitelisting works as expected and does
not override other power saving restrictions.
Bug: 117846754
Bug: 111423978
Test: atest CtsHostsideNetworkTests
and atest NetworkPolicyManagerServiceTest
Change-Id: I09172184e2fe543d6723639e5e62ae6afd5a6087
2018-11-28 14:36:13 -08:00
Mark Chien
89dcfe055e
Merge "Exempt adb socket for hostside VpnTest" am: 1b99a84106 am: 78ca8f0922
...
am: 1acaa68419
Change-Id: I04ea63d2a8f4de90af63e90c09decc2edfada50e
2018-11-26 00:18:47 -08:00
Mark Chien
1acaa68419
Merge "Exempt adb socket for hostside VpnTest" am: 1b99a84106
...
am: 78ca8f0922
Change-Id: I0543c551d82002e6fc0a6115e614232062519328
2018-11-26 00:10:58 -08:00
Mark Chien
78ca8f0922
Merge "Exempt adb socket for hostside VpnTest"
...
am: 1b99a84106
Change-Id: I032a25b809c50f3119ca16d79880b194dee28652
2018-11-26 00:06:21 -08:00
markchien
de0f268f78
Exempt adb socket for hostside VpnTest
...
Vpn test would destroy socket. If adb run over network, adb
socket would be killed during Vpn test. Then, test stop due to
adb disconnect.
Bug: 119382723
Test: - build pass
- run cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideVpnTests
Change-Id: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
2018-11-22 20:39:46 +08:00
Roshan Pius
d0a2b9d50a
WifiManagerTest: Test for new privileged permission
...
Add a new test to ensure that the NETWORK_MANAGED_PROVISIONING is only
granted to the correct app.
Bug: 115980767
Test: atest WifiManagerTest
Change-Id: Ifca1fcd81e201134bbb4173c3f142cca91ed49f9
2018-11-16 17:26:01 -08:00
Roshan Pius
9d7688dd9e
WifiManagerTest: Remove tests for deprecated API's
...
Remove/Modify tests that are invoking the deprecated API's. Use the
shell automator to toggle wifi state.
CTS tests for the replacement API surface (i.e NetworkRequest &
NetworkSuggestion) will be added later.
Bug: 115504728
Test: `atest android.net.wifi.cts.WifiManagerTest`
Change-Id: I04b3e1572ddfd31b28639185e5cf54dd70a1ae42
2018-11-13 13:28:38 -08:00
Bill Yi
8f9ad2b545
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: c25ddbfef4 -s ours am: 7c34d32772 -s ours
...
am: 8a70fedf51 -s ours
Change-Id: I9f90b38cfa784b1d6b859add4471f229f77130c4
2018-10-24 20:31:03 -07:00
Bill Yi
8a70fedf51
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: c25ddbfef4 -s ours
...
am: 7c34d32772 -s ours
Change-Id: Ide895e3e01d0849dfcb6d6609112ec5c052ecd12
2018-10-24 19:52:50 -07:00
Bill Yi
7c34d32772
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
...
am: c25ddbfef4 -s ours
Change-Id: I89e2aa427fd926041d4689e8cb85da2459372fec
2018-10-24 16:03:47 -07:00
Bill Yi
c25ddbfef4
Merge pie-platform-release to aosp-master - DO NOT MERGE
...
Change-Id: Ie395adde23471676aa6ea5604e3ced527dbf887a
2018-10-24 14:45:11 -07:00
Bill Yi
1043d62ef3
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: fa18597e5e -s ours
...
am: 6c506ece24 -s ours
Change-Id: I7be693d806979993a85bfbb0e9e8740f7e8c45b4
2018-10-24 10:30:36 -07:00
Bill Yi
6c506ece24
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
am: fa18597e5e -s ours
Change-Id: I2ed30daf47c20b3896e50f5abf82a72e7ec99d55
2018-10-24 10:13:25 -07:00
Bill Yi
fa18597e5e
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
Change-Id: I53e68a9fa72d1f0635d4384fc7e9550e8a45d3c3
2018-10-24 09:04:51 -07:00
Bill Yi
3bfb0ecba6
Merge pi-dr1-dev to aosp-master am: 394eb13546 am: b12ac32195
...
am: 71ca84e8e7
Change-Id: I1af02b6d487fea08793a1dbb6f05a8c61945b318
2018-10-19 14:58:12 -07:00
Bill Yi
71ca84e8e7
Merge pi-dr1-dev to aosp-master am: 394eb13546
...
am: b12ac32195
Change-Id: Ic5044793f23ba7a7290ac4cff1f622a13f3ddd26
2018-10-19 14:46:17 -07:00
Bill Yi
b12ac32195
Merge pi-dr1-dev to aosp-master
...
am: 394eb13546
Change-Id: Ic9a895f9a638221d9d2e6e501032d7f6b7cc9351
2018-10-19 14:37:23 -07:00
Bill Yi
394eb13546
Merge pi-dr1-dev to aosp-master
...
Change-Id: I7cd9310e06805e7d2b70a53873f5f0e235c0ac38
2018-10-19 12:20:13 -07:00
Chalard Jean
142f439e43
Merge "Add Uri tests for IPv6 literal adresses" am: 3d869fea91 am: 4b6c4acdb7
...
am: 3795638e43
Change-Id: I002d9dc151c1b88da5c4e7b8df4a3618aab545ed
2018-10-19 06:22:25 -07:00
Chalard Jean
3795638e43
Merge "Add Uri tests for IPv6 literal adresses" am: 3d869fea91
...
am: 4b6c4acdb7
Change-Id: I8628eed7510087ab5c27f86915f4360faec9d6d1
2018-10-19 06:09:10 -07:00
Chalard Jean
4b6c4acdb7
Merge "Add Uri tests for IPv6 literal adresses"
...
am: 3d869fea91
Change-Id: I7b1722c93a24c10cbcae0449d7f8cb2acdefa967
2018-10-19 05:07:08 -07:00
Treehugger Robot
3d869fea91
Merge "Add Uri tests for IPv6 literal adresses"
2018-10-19 11:04:29 +00:00
Chalard Jean
2a41b1cdda
Add Uri tests for IPv6 literal adresses
...
Bug: 25540738
Test: this
Change-Id: Id63a5dd17293014218df78bcb440993cc5f3beb8
2018-10-19 08:56:18 +00:00
Pavel Maltsev
5f842aedd5
Merge "CTS to verify local-only hotspot started at 2Ghz"
2018-10-16 18:35:32 +00:00
Neil Fuller
ba6c03374b
Merge "Remove explicit dependency on conscrypt" am: 92ed75c5f7 am: 895ebc7f40
...
am: 12c7d2828d
Change-Id: Id13eb586715fa56a243c15fa80a39472501cc913
2018-10-12 04:09:47 -07:00
Neil Fuller
12c7d2828d
Merge "Remove explicit dependency on conscrypt" am: 92ed75c5f7
...
am: 895ebc7f40
Change-Id: Ifc60c79244a991731e563e020a761c99002bf39e
2018-10-12 04:01:18 -07:00
Neil Fuller
895ebc7f40
Merge "Remove explicit dependency on conscrypt"
...
am: 92ed75c5f7
Change-Id: I46191c34b492a7ccb4c679a8e5d133d29a407b15
2018-10-12 03:53:06 -07:00
Neil Fuller
0b72fa9cfe
Remove explicit dependency on conscrypt
...
The dependency is unnecessary as by default conscrypt
is included in the "standard libraries".
Test: build
Bug: 113148576
Change-Id: I30d68049215c61931bdd7aa5e2a0f125e6d1bf90
2018-10-11 16:11:37 +01:00
Pavel Maltsev
f99027bf27
CTS to verify local-only hotspot started at 2Ghz
...
The only exception is automotive builds which may start local-only
hotspot at 5Ghz
Bug:115666270
Test: run cts -m CtsNetTestCases -t
android.net.wifi.cts.WifiManagerTest#testStartLocalOnlyHotspotSuccess
Change-Id: Ic3df22dab4ee93b531b92e6ed38adfa2b75880c7
2018-10-05 15:04:34 -07:00
Etan Cohen
c7758c460c
[CTS] Clarify CTS assert message for missing RTT AP support
...
Add a much more verbose message for the common failure case in which
the CTS is run without an AP which supports IEEE 802.11mc / RTT. That
may help speed up issue resolution.
Bug: 116849381
Test: atest WifiRttTest
Change-Id: I4ea3fbe17563f0087a013cbf48f7f601fec7e363
2018-10-05 07:33:43 -07:00
saurav subedi
9ac171651b
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev am: 4173c4fce5 -s ours" into pie-cts-dev am: 7b1734a9b4 -s ours" am: 84ccc5fc6b -s ours am: 98b4477869 -s ours
...
am: 33f8cba38f -s ours
Change-Id: Ib98843c80a4380c68d830d1d4e9f1ef6a4a02c4c
2018-10-02 14:06:58 -07:00
saurav subedi
33f8cba38f
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev am: 4173c4fce5 -s ours" into pie-cts-dev am: 7b1734a9b4 -s ours" am: 84ccc5fc6b -s ours
...
am: 98b4477869 -s ours
Change-Id: I1056aa02fe68f44161caf138b275ac57dee26e8b
2018-10-02 13:48:09 -07:00
saurav subedi
96bd9a269d
Merge "[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev am: 4173c4fce5 -s ours" into pie-cts-dev am: 7b1734a9b4 -s ours am: 9fc53d028b
...
am: 3432e21f81 -s ours
Change-Id: I61b66cd62d8c2f7bae47c87fcaf12464afd2fa3b
2018-10-02 13:36:47 -07:00
saurav subedi
0d23fd4988
[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev am: 4173c4fce5 -s ours am: 1862b3f6be -s ours am: 9b3db79417
...
am: 0d4ec7b056 -s ours
Change-Id: Iba07e2d400e91370756dbd9f5db884c1aa07cc0c
2018-10-02 13:36:12 -07:00
saurav subedi
3432e21f81
Merge "[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev am: 4173c4fce5 -s ours" into pie-cts-dev am: 7b1734a9b4 -s ours
...
am: 9fc53d028b
Change-Id: I38a41548f1959635256d4a9db907c08b3344b4c5
2018-10-02 13:33:49 -07:00
saurav subedi
98b4477869
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev am: 4173c4fce5 -s ours" into pie-cts-dev am: 7b1734a9b4 -s ours"
...
am: 84ccc5fc6b -s ours
Change-Id: If9e5d84b8eac4960da17452591a1b66f16019f33
2018-10-02 13:31:54 -07:00
saurav subedi
9fc53d028b
Merge "[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev am: 4173c4fce5 -s ours" into pie-cts-dev
...
am: 7b1734a9b4 -s ours
Change-Id: I902b74f657b9f3ffd8c4df80c0ef6abd36e55506
2018-10-02 13:27:23 -07:00
saurav subedi
0d4ec7b056
[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev am: 4173c4fce5 -s ours am: 1862b3f6be -s ours
...
am: 9b3db79417
Change-Id: Iff93fd7ce2112ffba653dcc1c0b022f0d79f8a2e
2018-10-02 13:25:59 -07:00
Android Merger
84ccc5fc6b
Merge "Merge "[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev am: 4173c4fce5 -s ours" into pie-cts-dev am: 7b1734a9b4 -s ours"
2018-10-02 19:58:53 +00:00
saurav subedi
14573d43fb
Merge "[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev am: 4173c4fce5 -s ours" into pie-cts-dev
...
am: 7b1734a9b4 -s ours
Change-Id: Ibefdc0e48c621fd96dd0cace3ee514efa426c714
2018-10-02 12:58:48 -07:00
saurav subedi
9b3db79417
[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev am: 4173c4fce5 -s ours
...
am: 1862b3f6be -s ours
Change-Id: Id499c91a3679a82ffa0c82ade74092273884efee
2018-10-02 12:55:45 -07:00
Android Merger
7b1734a9b4
Merge "[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev am: 4173c4fce5 -s ours" into pie-cts-dev
2018-10-02 19:54:48 +00:00