markchien
caee99b3cf
Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b
...
am: 04118c8a30
2019-06-26 21:37:47 -07:00
markchien
04118c8a30
Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev
...
am: 0ff953bf1b
Change-Id: I94e8de44713f076783073371cca65c4b5579220e
2019-06-26 21:17:51 -07:00
markchien
d51ae5760d
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
Bug: 135225500
Test: - build pass
Change-Id: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: Id6f986aacc3cadf713ebbc8305ca535b861390fc
(cherry picked from commit de0f268f78
2019-06-19 08:21:00 +00: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: c8541fdf003a984ca812
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: 15f4a80a933a984ca812
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: b6d3940f893a984ca812
2019-04-08 19:02:38 -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: 50491fb1cc3a984ca812
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
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
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
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
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
Roshan Pius
8619176b0c
resolve merge conflicts of 8c61445473bc2842c8c9490225e97321b65d267c to oc-dev
...
am: 934ff00f93
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
Ray Essick
b8f58fb9b6
Merge "Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev am: dbfdb95147" into oc-dev
...
am: be259ff997
2018-04-09 18:41:09 -07:00
Ray Essick
6edfe17ca2
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
2018-04-09 18:01:25 -07:00
Ray Essick
d89cacb7bf
[automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89 am: afef57cad5 am: 1e1b2a7606
...
am: 9289660d76
2018-04-09 17:56:53 -07:00
Ray Essick
56927e7cae
[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 skipped: d033198a42 skipped: c550755e79 skipped: 27bbc3628e
...
am: ce176b9ffc
2018-04-09 17:54:49 -07:00
Ray Essick
14e18f9179
[automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5 am: 02cf01f51c am: 010e44479d am: 790a6f6d52
...
am: df21617fed
2018-04-09 17:50:54 -07:00
Ray Essick
591f6ccb9c
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours skipped: 868997117d skipped: a4cf60e6ea skipped: 8b6d971588 skipped: 63eae3a9e1 skipped: 1a158af55d
...
am: 096c85e4cf
2018-04-09 17:48:42 -07:00
Ray Essick
10bed1ef52
[automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f am: c0ca2003bc am: c4691f5ad5 am: d27bde6edf am: c5c83b10ac am: 41c0a7b438
...
am: a11caf34cc
2018-04-09 17:45:03 -07:00
Ray Essick
06c461a30b
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours skipped: 151750d842 skipped: d1811f0384 skipped: bbfa5d23a9 skipped: c407f8968b skipped: 6fc9eb97c5 skipped: 973a5cd865 skipped: cd9a559fd2 skipped: 853c5 skipped: c26ea26d31
...
am: 4d4f3950b6
2018-04-09 17:42:39 -07:00
Ray Essick
72405a1736
[automerger] Merge changes from topic "am-c7faa8cb80994bb993d5bdac6eca009c" into nougat-mr1-cts-dev am: 36b9badd7a am: 27b937e5fc am: 8c0df95444 am: 0c19a15081
...
am: fbc9d49796
2018-04-09 17:38:19 -07:00
Ray Essick
66ef84dac4
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours skipped: 1cdd92daaa skipped: 7a92b9afdb skipped: 849e67fad2
...
am: d2e50eb968
2018-04-09 17:36:24 -07:00
Ray Essick
37ca5b50e8
Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev am: 1c90ff8dcf
...
am: 5b5f73c2e8
2018-04-09 17:33:40 -07:00
Ray Essick
7a3920dfa4
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours am: 308f60a04c -s ours
...
am: c1a7ce019c
2018-04-09 17:16:08 -07:00
Android Build Merger (Role)
be259ff997
Merge "Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev am: dbfdb95147" into oc-dev
2018-04-10 00:14:42 +00:00
Android Build Merger (Role)
68dc050239
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
2018-04-10 00:14:08 +00:00
Ray Essick
6b4abc5610
Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev
...
am: dbfdb95147
2018-04-09 17:13:42 -07:00
Ray Essick
52d573a044
Merge changes from topic "am-0ac6ccf47239465e9891c4d8b9d8f076" into oc-dev
...
am: 7fc94d02ca
2018-04-09 17:13:22 -07:00
Ray Essick
5967d48708
[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
2018-04-09 17:12:59 -07:00
Android Build Merger (Role)
9289660d76
[automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89 am: afef57cad5 am: 1e1b2a7606
...
Change-Id: If096ea0d5c073cecf2e8e22a59b102702a42a15c
2018-04-10 00:10:38 +00:00
Android Build Merger (Role)
1e1b2a7606
[automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89 am: afef57cad5
...
Change-Id: I95c778fbe4453b8e89991af0fefce3b1fff52e40
2018-04-10 00:10:34 +00:00
Android Build Merger (Role)
afef57cad5
[automerger] Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da am: 1ce0bfba89
...
Change-Id: Ic9741b09169ad6ad4c1c7874fd59c090f4111fc6
2018-04-10 00:10:30 +00:00
Android Build Merger (Role)
ce176b9ffc
[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 skipped: d033198a42 skipped: c550755e79 skipped: 27bbc3628e
...
Change-Id: I5c8a8aa2a76cf62357d437385d907a4df9398a95
2018-04-10 00:10:05 +00:00
Android Build Merger (Role)
27bbc3628e
[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 skipped: d033198a42 skipped: c550755e79
...
Change-Id: Ie28a51e1566ef41b05e6ff03c03129ada1a20c23
2018-04-10 00:10:02 +00:00
Android Build Merger (Role)
c550755e79
[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 skipped: d033198a42
...
Change-Id: Ib74134a9b610ec81c2dd0b428efadc955dfe032a
2018-04-10 00:09:58 +00:00
Ray Essick
1ce0bfba89
Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev
...
am: 8ef12d94da
2018-04-09 17:09:35 -07:00
