Rebecca Silberstein
f2a2e42bd0
[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a am: 8c71ef4f2e -s ours
...
am: 6c0b196b2e -s ours
Change-Id: I31bd21b35f6906f8bd6dbb8fbee2301eb9a7ce32
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 -s ours
Change-Id: I4f4fa863be658d32bf14bfc92a92523a2b5d9792
2018-10-01 15:54:22 -07:00
Rebecca Silberstein
6c0b196b2e
[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a
...
am: 8c71ef4f2e -s ours
Change-Id: I08adcf1639fa9f819e52caf267162cdd34b596f1
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 -s ours
Change-Id: I67c0c581d1c559cbf1d3737ef322bc41ea537128
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
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
f153c4d29e
Merge "Refactor duplicate code into single function" am: 1b118b032b
...
am: 3ea2bfe8c1
Change-Id: I371770b779fdef3abcc10bac062a9d05b8b93da7
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
1c4ab19478
Merge "Move tests requiring /proc/sys/net access to hostside" am: ee3d0d4fba
...
am: 286b5f2df8
Change-Id: Idd8e044110969d81458f4a6c9c76c9c8506e72ee
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
Jeffrey Vander Stoep
29e7b8ad82
Merge "VpnTest: test getConnectionOwnerUid API" am: ee991403a1
...
am: 7efa354f0c
Change-Id: I097baca24df23cf9dfaf9fafb80b448c752e9cf7
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
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
d0ae2d419e
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 -s ours
...
am: 4f4cb685a1 -s ours
Change-Id: Id8745e4d6f3fad5305f157f3fdecf0f4d98d8489
2018-09-06 20:10:23 -07:00
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
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 -s ours
Change-Id: I31023d453fdfa7c6a7fd92f061241a027bd085dd
2018-09-06 14:51:22 -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
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 -s ours
Change-Id: I9ea2fccf656a78ebe195a48420215b69dae8923d
2018-09-06 14:31:36 -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