Rebecca Silberstein
c580f11166
Merge "Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours" into pie-cts-dev am: a9d9e557e6 -s ours"
...
am: 695f741a71
2018-12-05 21:36:13 -08:00
Android Merger
695f741a71
Merge "Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours" into pie-cts-dev am: a9d9e557e6 -s ours"
2018-12-06 04:59:14 +00:00
Rebecca Silberstein
16d6f1f7db
Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours" into pie-cts-dev
...
am: a9d9e557e6
2018-12-05 20:59:02 -08:00
Android Merger
a9d9e557e6
Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours" into pie-cts-dev
2018-12-06 04:51:40 +00:00
Rebecca Silberstein
a6b44c093b
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 20:51:32 -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
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
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
Bill Yi
7c34d32772
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
...
am: c25ddbfef4
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
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
b12ac32195
Merge pi-dr1-dev to aosp-master
...
am: 394eb13546
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
4b6c4acdb7
Merge "Add Uri tests for IPv6 literal adresses"
...
am: 3d869fea91
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
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
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
2018-10-02 13:31:54 -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
2018-10-02 12:58:48 -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
saurav subedi
69e6c0744e
[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:54: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
4572cb4361
Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a -s ours" into pie-cts-dev am: 88aab6ce5f -s ours"
...
am: d68df5c1ec
2018-10-01 15:43:14 -07:00
Android Merger
d68df5c1ec
Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a -s ours" into pie-cts-dev am: 88aab6ce5f -s ours"
2018-10-01 22:08:29 +00:00
Rebecca Silberstein
0552d427ad
Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a -s ours" into pie-cts-dev
...
am: 88aab6ce5f
2018-10-01 15:08:23 -07:00
Android Merger
88aab6ce5f
Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a -s ours" into pie-cts-dev
2018-10-01 22:02:15 +00:00
Rebecca Silberstein
22432b02e4
[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev
...
am: 354de98f9a -s ours
Change-Id: I07ca9a21d95bb46d0bc3b8cc8f1f3b50a1480da5
2018-10-01 15:02:07 -07:00
Jeff Vander Stoep
3ea2bfe8c1
Merge "Refactor duplicate code into single function"
...
am: 1b118b032b
Change-Id: I81baf65489c3c282416ec3903d13f6a94a079e95
2018-09-30 22:45:48 -07:00
Jeff Vander Stoep
286b5f2df8
Merge "Move tests requiring /proc/sys/net access to hostside"
...
am: ee3d0d4fba
Change-Id: I22de2a03481b8f7bf87d040c778ff524866c5655
2018-09-28 14:12:04 -07:00
Jeff Vander Stoep
d502c99123
Refactor duplicate code into single function
...
Address comments in aosp/763607
Bug: 116053204
Test: atest ProcNetTest
Change-Id: Iec8b58b6499a7764b3757d4dd820e1f45a65e814
2018-09-28 10:36:12 -07:00
Jeff Vander Stoep
ff39f3fa71
Move tests requiring /proc/sys/net access to hostside
...
This access is going away for apps. Move these tests to hostside
tests to be executed by the shell domain.
Test: atest cts/hostsidetests/net/src/com/android/cts/net/ProcNetTest.java
Test: atest android.net.cts.ConnectivityManagerTest
Test: atest android.net.cts.IpSecSysctlTest
Test: atest android.net.cts.MultinetworkSysctlTest
Bug: 116053204
Change-Id: Id7e867184dd344a2d877515956e76019d627788b
2018-09-28 10:29:01 -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
Jeffrey Vander Stoep
7efa354f0c
Merge "VpnTest: test getConnectionOwnerUid API"
...
am: ee991403a1
Change-Id: Ia45858d32da629aeb9795a0dcc98ef97d0f001ff
2018-09-21 14:21:43 -07:00
Jeff Vander Stoep
ab53484d7b
VpnTest: test getConnectionOwnerUid API
...
Test connection->UID resolution for both UDP and TCP connections.
Bug: 9496886
Bug: 109758967
Test: atest HostsideVpnTests
Change-Id: Ic17c64df74f65d788fd3d95a25af3c5b44946881
2018-09-18 15:40:32 -07: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
4f4cb685a1
Merge "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: d80f2b67cc
2018-09-06 14:51:22 -07:00
Android Merger
d80f2b67cc
Merge "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"
2018-09-06 21:31:44 +00:00
saurav subedi
facf321e05
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
2018-09-06 14:31:36 -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
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
2018-08-30 16:07:33 -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
2018-08-30 15:37:08 -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
