Neil Fuller
ba6c03374b
Merge "Remove explicit dependency on conscrypt" am: 92ed75c5f7 am: 895ebc7f40
...
am: 12c7d2828d
2018-10-12 04:09:47 -07:00
Neil Fuller
12c7d2828d
Merge "Remove explicit dependency on conscrypt" am: 92ed75c5f7
...
am: 895ebc7f40
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
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
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
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
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
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
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
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
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
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
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
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
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
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
58ee746c15
Merge "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 -s ours am: 4572cb4361 -s ours" into pi-dev-plus-aosp
...
am: b03d045a65
2018-10-01 16:56:55 -07:00
Rebecca Silberstein
7c33d7389b
[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a am: 8c71ef4f2e -s ours am: 6c0b196b2e -s ours
...
am: f2a2e42bd0
2018-10-01 16:50:17 -07:00
Rebecca Silberstein
8cfd6178bc
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: 7e40d670d1 -s ours
...
am: 810b0a0fe6
2018-10-01 16:46:37 -07:00
Android Build Merger (Role)
b03d045a65
Merge "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 -s ours am: 4572cb4361 -s ours" into pi-dev-plus-aosp
2018-10-01 22:59:01 +00:00
Rebecca Silberstein
f97b308748
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 -s ours
...
am: 4572cb4361
2018-10-01 15:58:48 -07:00
Rebecca Silberstein
f2a2e42bd0
[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a am: 8c71ef4f2e -s ours
...
am: 6c0b196b2e
2018-10-01 15:57:26 -07:00
Rebecca Silberstein
810b0a0fe6
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: 7e40d670d1
2018-10-01 15:54:22 -07: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
Rebecca Silberstein
6c0b196b2e
[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a
...
am: 8c71ef4f2e
2018-10-01 15:36:10 -07:00
Rebecca Silberstein
7e40d670d1
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:33:32 -07: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
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
Oscar Shu
5e8b17d0b2
Merge "CTS: Location scan is not disabled at screen off"
2018-10-01 20:23:22 +00:00
xshu
7f494f6918
CTS: Location scan is not disabled at screen off
...
Location Wi-Fi scanning should not be turned off when the screen turns off.
Bug: 113876483
Test: Run CTS, manually toggle location Wi-Fi scanning off right after the screen
turns on and observe failure.
Test: Run CTS with location Wi-Fi scanning initially turned off and observe failure.
Test: Run CTS with location Wi-Fi scanning initially turned on and observe
success.
Change-Id: I092a3854b6365de72c2cfe38a55a0e1cedfcabd9
2018-10-01 10:24:05 -07:00
Jeff Vander Stoep
1b33466987
Merge "Refactor duplicate code into single function" am: 1b118b032b am: 3ea2bfe8c1
...
am: f153c4d29e
2018-09-30 23:02:03 -07:00
Jeff Vander Stoep
f153c4d29e
Merge "Refactor duplicate code into single function" am: 1b118b032b
...
am: 3ea2bfe8c1
2018-09-30 22:52:51 -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
a95744a498
Merge "Move tests requiring /proc/sys/net access to hostside" am: ee3d0d4fba am: 286b5f2df8
...
am: 1c4ab19478
2018-09-28 14:38:01 -07:00
Jeff Vander Stoep
1c4ab19478
Merge "Move tests requiring /proc/sys/net access to hostside" am: ee3d0d4fba
...
am: 286b5f2df8
2018-09-28 14:27:00 -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
77636d2212
Merge "Merge "VpnTest: test getConnectionOwnerUid API" am: ee991403a1 am: 7efa354f0c" into pi-dev-plus-aosp
...
am: 8e7f2ebdc6
Change-Id: Iae344439463a8d57ab4c0a18f186ae1877637eb5
2018-09-21 15:46:06 -07:00
Jeffrey Vander Stoep
29e7b8ad82
Merge "VpnTest: test getConnectionOwnerUid API" am: ee991403a1
...
am: 7efa354f0c
2018-09-21 14:42:46 -07: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
