Android Build Merger (Role)
080280ebff
[automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 am: aa92791e8b am: d086c29189
...
Change-Id: I2c21749f6f896e382f7afdf913ab8a84f6723c2b
2019-08-24 03:32:12 +00:00
Android Build Merger (Role)
d086c29189
[automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324 am: aa92791e8b
...
Change-Id: I7ed1d70db711cd33aa0e806d7d5f9946ca2e951c
2019-08-24 03:32:08 +00:00
Android Build Merger (Role)
aa92791e8b
[automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45 am: ddfb743324
...
Change-Id: I7f41806ea7bb0148d181e848d55e53f264596ec5
2019-08-24 03:32:05 +00:00
Chalard Jean
ddfb743324
Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev
...
am: af4499cf45
2019-08-23 20:31:47 -07:00
Treehugger Robot
af4499cf45
Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev
2019-08-23 18:10:09 +00:00
Chalard Jean
2bf54f7c79
Attempt "fix" the broken QUIC packet to be slightly less broken
...
Bug: 139403355
Signed-off-by: Erik Kline <ek@google.com >
Merged-In: I9c938998b5e30f7d3994b410878b2af6a75f9b5a
Test: in I9c938998b5e30f7d3994b410878b2af6a75f9b5a
(cherry picked from commit 8ce68f1310
2019-08-23 09:49:42 +00:00
Android Build Merger (Role)
f611b30669
[automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7 am: 446311265a
...
Change-Id: I13d8da83b93f444310e647f11d4e6801557a892b
2019-08-21 08:10:44 +00:00
Android Build Merger (Role)
446311265a
[automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74 am: d6ae111ff7
...
Change-Id: I997dd232a40e070079c446da9003f6035c53355e
2019-08-21 08:10:38 +00:00
Android Build Merger (Role)
d6ae111ff7
[automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2 am: 9c8f9cef74
...
Change-Id: I1e15a9124ea6251fe44401f194416cbf5707d523
2019-08-21 08:10:34 +00:00
Android Build Merger (Role)
9c8f9cef74
[automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93 am: c2a5ccb153 am: ef295eafa2
...
Change-Id: I4a5a31dfb9e894afc352b082e344b17b4e3209c2
2019-08-21 08:10:29 +00:00
Android Build Merger (Role)
c2a5ccb153
[automerger] Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev am: e9da15c22e am: 7e685d9f80 am: 3d29223c93
...
Change-Id: Ica6b9699d7c429d6f0d4088fb0a05b4ecf49e818
2019-08-21 08:10:20 +00:00
Chalard Jean
7e685d9f80
Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev
...
am: e9da15c22e
2019-08-21 01:09:45 -07:00
Treehugger Robot
e9da15c22e
Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into marshmallow-cts-dev
2019-08-21 07:53:28 +00:00
Chalard Jean
8ce68f1310
Attempt "fix" the broken QUIC packet to be slightly less broken
...
Bug: 139403355
Signed-off-by: Erik Kline <ek@google.com >
Merged-In: I9c938998b5e30f7d3994b410878b2af6a75f9b5a
Test: in I9c938998b5e30f7d3994b410878b2af6a75f9b5a
(cherry picked from commit b5e98a971a73693740a784e8bd355df41df6faa2)
Change-Id: I329c06395d63500ff20c77cee670566d83c3ac8a
2019-08-20 10:13:50 +00:00
Android Build Merger (Role)
9ee527d848
[automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3 am: c4031da617 am: 1635ad610f am: 21e123fdf6
...
Change-Id: Ie7fd5c786de0da298e2a2a3dd34ad5d5d4dab98d
2019-07-29 02:07:54 +00:00
Android Build Merger (Role)
21e123fdf6
[automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3 am: c4031da617 am: 1635ad610f
...
Change-Id: Idd42f33615f8e2e08cd60082d805bf85ff6be4d0
2019-07-29 02:07:48 +00:00
Android Build Merger (Role)
1635ad610f
[automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3 am: c4031da617
...
Change-Id: Ib59590b6ec8012bd56dc02fd485ffb5a693dd38f
2019-07-29 02:07:39 +00:00
markchien
c4031da617
Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev
...
am: 873f2d8aa3
Change-Id: Ic968bb8f93e3471b9b5b47d336752957b23ce16b
2019-07-26 09:50:47 -07:00
markchien
dd32bb52f7
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
Bug: 126645908
Test: Just cherry-pick with conflict fix
Change-Id: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: Id6f986aacc3cadf713ebbc8305ca535b861390fc
(cherry picked from commit de0f268f78
2019-07-18 12:43:04 +00:00
Android Build Merger (Role)
5530604a47
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76 am: e386847db3
...
Change-Id: Ia7b615ad33acdcee358ceaa5a424e4bfff155998
2019-07-08 19:24:06 +00:00
Android Build Merger (Role)
e386847db3
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5 am: 8e99f9ef76
...
Change-Id: If285f192d8078cd4934e6700b3b6a535185f1b53
2019-07-08 19:23:59 +00:00
Android Build Merger (Role)
8e99f9ef76
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4 am: 047d1a9ed5
...
Change-Id: I03f5b6a01337158727e56ad60a79d9f2a87daf7e
2019-07-08 19:23:55 +00:00
Android Build Merger (Role)
047d1a9ed5
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c am: cbc0a6b066 am: c7ec3629b4
...
Change-Id: I0669f124ad6d84592053ac199c7fd1831fb8f7d3
2019-07-08 19:23:50 +00:00
Android Build Merger (Role)
cbc0a6b066
[automerger] Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev am: dd55552460 am: e6ced2f716 am: 669d55b57c
...
Change-Id: I3611dbe31a1c1d42c22549e065dce570e97bada3
2019-07-08 19:23:45 +00:00
Lorenzo Colitti
e6ced2f716
Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev
...
am: dd55552460
2019-07-08 12:23:07 -07:00
Treehugger Robot
dd55552460
Merge "Fix expected reverse lookup of Google DNS IP addresses" into marshmallow-cts-dev
2019-07-08 18:39:08 +00:00
Lorenzo Colitti
86d07d0147
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-07-03 13:47:01 +09: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
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)
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
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)
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
Ray Essick
d033198a42
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours
...
am: bafd18446f
2018-04-09 17:05:38 -07:00
Android Build Merger (Role)
010e44479d
[automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5 am: 02cf01f51c
...
Change-Id: I8e84f13cf6f8f31ad96562acfce7d503b6b73304
2018-04-09 23:58:00 +00:00
Android Build Merger (Role)
02cf01f51c
[automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e am: c2f39f64b5
...
Change-Id: Iea5d02461fb181773d87e87cecae8ebd7fa4dfe3
2018-04-09 23:57:55 +00:00
Android Build Merger (Role)
c2f39f64b5
[automerger] Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d am: e451b4062e
...
Change-Id: If5d1bb2ea504d9ca25a661e49eeb68274e02735c
2018-04-09 23:57:51 +00:00
Android Build Merger (Role)
63eae3a9e1
[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
...
Change-Id: I66b017a380139a43f5c6fad8e86b69509f1cb834
2018-04-09 23:57:01 +00:00
Android Build Merger (Role)
8b6d971588
[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
...
Change-Id: If7186d1a551c931e37ce6481f60bff81ffc3ba9f
2018-04-09 23:56:58 +00:00
Android Build Merger (Role)
a4cf60e6ea
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours skipped: 868997117d
...
Change-Id: Iac9c8c8265809970e40abcdeb1600db0bd537df2
2018-04-09 23:56:54 +00:00
Ray Essick
e451b4062e
Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev
...
am: 1fd90c968d
2018-04-09 16:56:40 -07:00
Ray Essick
868997117d
[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours
...
am: afb3e84599
2018-04-09 16:54:52 -07:00
Android Build Merger (Role)
c5c83b10ac
[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
...
Change-Id: I5aab9ff7ac9f7fa424e2608dcaba77e2b2916dbb
2018-04-09 23:49:08 +00:00
