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
saurav subedi
64c0abef0f
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
...
am: d0ae2d419e
2018-09-06 20:25:08 -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
2018-09-06 20:10:23 -07:00
saurav subedi
9ade68bc19
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
...
am: aea9fa1fe5
2018-09-06 17:32:07 -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
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
2018-09-06 16:26:01 -07:00
saurav subedi
37f1a8b4fb
[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
...
am: 518da1c897
2018-09-06 15:13:30 -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
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
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
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
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
5d6ce53651
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
...
am: 4a63d9911d
2018-08-30 16:42:34 -07:00
saurav subedi
858ad96ec8
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
...
am: 54c7c44cb8
2018-08-30 16:40:09 -07:00
saurav subedi
4cbf78d2b0
[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
...
am: 0e9dde690c
2018-08-30 16:38:59 -07: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
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
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
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
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
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
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
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
1046df1c16
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
...
am: 6cd3c38a57
2018-08-15 09:00:41 -07:00
Sudheer Shanka
658e673924
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
...
am: e62df79dd9
2018-08-15 08:16:30 -07:00
Sudheer Shanka
9ede5d0267
[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
...
am: 34a2b60e0e
2018-08-15 07:22:59 -07: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
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
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
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
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
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
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
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
Android Merger
352dda391e
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
2018-08-15 01:05:14 +00:00
Sudheer Shanka
6a2c9ec9bc
[automerger skipped] Merge "Use a different key for signing networkpolicy test app." into oreo-mr1-cts-dev
...
am: 4e67a8094e -s ours
Change-Id: I1c6594e5255883745690d5977c41ef9c8e529e71
2018-08-14 18:05:07 -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
Xin Li
528eae25e8
[automerger skipped] Merge "Merge pie-cts-dev into master." am: e5acef993c am: e68722baa5 -s ours am: 0d10cadd6b
...
am: 174af3caa4 -s ours
Change-Id: I502bf1e9af106c00c16985cc729ed18001e7963c
2018-08-08 20:52:24 -07:00
