Commit Graph

2101 Commits

Author SHA1 Message Date
Lorenzo Colitti
b8e0be9df1 [automerger skipped] Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev
am: d93f6d545c -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I1e70eb981896dd2382e67771da0da2eeb1168e69
2019-04-08 19:44:08 -07:00
Lorenzo Colitti
31812cb71a [automerger skipped] Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89 -s ours am: c8541fdf00 -s ours
am: 255af6675f -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: Ib784cfed5a3e51d81fd0a731a10ca778a7e6f794
2019-04-08 19:32:33 -07:00
Lorenzo Colitti
9fdfe85b32 [automerger skipped] Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc -s ours am: 15f4a80a93 -s ours
am: b4583d97e8 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: Ic896792d6c9a2df2a1bb8611078b69688773a2ae
2019-04-08 19:28:46 -07:00
Lorenzo Colitti
255af6675f [automerger skipped] Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89 -s ours
am: c8541fdf00 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I0a93aa855d17699c81984165eefba942a2ece695
2019-04-08 19:21:24 -07:00
Lorenzo Colitti
b4583d97e8 [automerger skipped] Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc -s ours
am: 15f4a80a93 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: Id8fe271de667b3e723703ad48c60db77bc801b35
2019-04-08 19:18:09 -07:00
Lorenzo Colitti
c8541fdf00 [automerger skipped] Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev
am: b6d3940f89 -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I63b7048673b9de5a85381372f59c10ba91f78c9b
2019-04-08 19:02:38 -07:00
Lorenzo Colitti
27bbe03b65 [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0 am: 88a48fcbfe am: 9c3250f49c am: 761b3e5e7b am: e7ee057428 am: bc9edb5254
am: 296cfbb29c

Change-Id: I254dbd2d33f340c150ea897823c6c0a257da958d
2019-04-08 18:26:32 -07:00
Android Merger
d93f6d545c Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev 2019-04-09 00:52:27 +00:00
Lorenzo Colitti
926ebf2d47 Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev
am: b6d3940f89

Change-Id: Iacbf91536898e4b0d8942581593ab87eae0af323
2019-04-08 17:52:15 -07:00
Android Build Merger (Role)
15f4a80a93 [automerger skipped] Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc -s ours am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 833 skipped: 1b13dec4ca
Change-Id: I02088c35c326599b5d3fc3164d9c6f8bac76601d
2019-04-09 00:26:23 +00:00
Android Build Merger (Role)
1b13dec4ca [automerger skipped] Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc -s ours am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 833 skipped: 1fcd704e84
Change-Id: I36d4291bdf7ce0648eff1c47f95747327c9fdfa6
2019-04-09 00:26:20 +00:00
Android Build Merger (Role)
1fcd704e84 [automerger skipped] Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc -s ours am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 833 skipped: 1b50f30867
Change-Id: I858c784b3729e6646775b1c148613ad0656b1e13
2019-04-09 00:26:16 +00:00
Lorenzo Colitti
1b50f30867 [automerger skipped] Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev
am: 50491fb1cc -s ours
am skip reason: change_id Iee8bfe418bf6003e5c78df77d75f6f9745249267 with SHA1 3a984ca812 is in history

Change-Id: I1d5e16687c38854c60aee253b9ac2b01750e6985
2019-04-08 17:25:56 -07:00
Lorenzo Colitti
296cfbb29c [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0 am: 88a48fcbfe am: 9c3250f49c am: 761b3e5e7b am: e7ee057428
am: bc9edb5254

Change-Id: Ia747dca9285940109dc2aebbfde4d1f184c020cd
2019-04-08 17:10:16 -07:00
Android Merger
b6d3940f89 Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev 2019-04-09 00:06:54 +00:00
Lorenzo Colitti
454f3193a3 Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev
am: 50491fb1cc

Change-Id: Ie5459302cb2aa040ed44747f189434091e1c4786
2019-04-08 17:06:38 -07:00
Android Merger
50491fb1cc Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev 2019-04-08 23:32:07 +00:00
Lorenzo Colitti
fe13c7233d Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev
am: 3b416dd354

Change-Id: I03a2f6f3631c25868d504892c5b885477dcfeb01
2019-04-08 16:31:57 -07:00
Android Build Merger (Role)
bc9edb5254 [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0 am: 88a48fcbfe am: 9c3250f49c am: 761b3e5e7b am: e7ee057428
Change-Id: I9fcc6c2dd3bc35112f0959a77ec48c19e741f6a4
2019-04-08 23:26:34 +00:00
Android Build Merger (Role)
e7ee057428 [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0 am: 88a48fcbfe am: 9c3250f49c am: 761b3e5e7b
Change-Id: Iab6abb5e32ed7bff2e75564446166cc182640d59
2019-04-08 23:26:31 +00:00
Android Build Merger (Role)
761b3e5e7b [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0 am: 88a48fcbfe am: 9c3250f49c
Change-Id: Ia126d22b102f0279432f6f4a92b14dfa8626f453
2019-04-08 23:26:27 +00:00
Android Build Merger (Role)
9c3250f49c [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0 am: 88a48fcbfe
Change-Id: I100af07ea8c391545d48b6b8888696a3622b54ec
2019-04-08 23:26:23 +00:00
Android Build Merger (Role)
88a48fcbfe [automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354 am: d4831efbe0
Change-Id: Ie85fee065ec9aef98036b75bf1b2497d760b8070
2019-04-08 23:26:20 +00:00
Lorenzo Colitti
d4831efbe0 Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev
am: 3b416dd354

Change-Id: I0228552c2231e0d2241e3c417e1ac5fe2495e619
2019-04-08 16:26:02 -07:00
Treehugger Robot
3b416dd354 Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev 2019-04-08 22:33:39 +00:00
Lorenzo Colitti
3a984ca812 Fix expected reverse lookup of Google DNS IP addresses
DnsTest.testDnsWorks expects that reverse lookup for the Google
public DNS servers will return something with google.com in the
name. This no longer works because the reverse DNS entries have
changed to dns.google.

Bug: 129452237
Test: atest android.net.cts.DnsTest.testDnsWorks
Change-Id: Iee8bfe418bf6003e5c78df77d75f6f9745249267
Merged-In: Iee8bfe418bf6003e5c78df77d75f6f9745249267
(cherry picked from commit 3852fd92f5)
2019-04-08 00:21:48 +00:00
Brio Automation
ebd34afef5 [automerger skipped] Merge "RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1" into oreo-mr1-cts-dev
am: af988f0d74 -s ours
am skip reason: subject contains skip directive

Change-Id: I3a482f4e516c0e9e417537478bc155925f0a0ea6
2019-03-26 17:48:22 -07:00
Brio Automation
b84038696c RESTRICT AUTOMERGE: Port "Exempt adb socket for hostside VpnTest" to Cts 8.1
https://android-review.googlesource.com/c/platform/cts/+/833600

Change-Id: Id6f986aacc3cadf713ebbc8305ca535b861390fc
Bug: 119382723
2019-03-26 00:31:14 +00:00
Rebecca Silberstein
97a50a1348 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

Change-Id: I3c6b067aa7bf8e1c54481dba8220f986d52a8687
2018-12-05 21:07:45 -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
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
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
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  -s ours

Change-Id: If04529fed5b670277d0987cc9b9ff3cc83f275ac
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
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
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
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
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
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
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
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
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
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
Ray Essick
5a9c21fc33 Merge "Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev am: dbfdb95147" into oc-dev am: be259ff997
am: b8f58fb9b6

Change-Id: Id856b845af55179f7d96ed55f0c5b7118c797a56
2018-04-09 18:51:42 -07:00
Ray Essick
c8b558b08f Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours am: 72b96b0354 -s ours" into oc-dev am: 68dc050239
am: 6edfe17ca2

Change-Id: I19b5b17dbd213dd08432c20c1a54b2c1c70a7eb1
2018-04-09 18:46:00 -07:00
Ray Essick
3977adb530 [automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89 am: afef57cad5 am: 1e1b2a7606 am: 9289660d76
am: d89cacb7bf

Change-Id: Iafd862995f1944bb56c5829a10dc8b997f941d2c
2018-04-09 18:41:41 -07:00
Ray Essick
b8f58fb9b6 Merge "Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev am: dbfdb95147" into oc-dev
am: be259ff997

Change-Id: I4fab6e7b601a853787226c12a8573e1f57306306
2018-04-09 18:41:09 -07:00