Commit Graph

1762 Commits

Author SHA1 Message Date
Android Build Merger (Role)
98a30a1eec [automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in hi skipped: 3df1075c11
Change-Id: Iebd2f338e22cc0ba4683bf419528bab6544581f7
2019-08-27 20:37:19 +00:00
Android Build Merger (Role)
3df1075c11 [automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in hi skipped: db920e28f1
Change-Id: I33017ee7629e5c564d7e0ae2b52f4c2f72f1fe33
2019-08-27 20:37:14 +00:00
Android Build Merger (Role)
db920e28f1 [automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in hi skipped: ac8557efc7
Change-Id: Ib0dfc700b221cbc5c608c99c3fa544a07706dc87
2019-08-27 20:37:09 +00:00
markchien
ac8557efc7 [automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev
am: 63dda3513d -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: I9be28d5c762c22e6c0b14a415a3d020450b443a6
2019-08-27 13:36:46 -07:00
Chalard Jean
6688a3468c Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev
am: 6bc025004b

Change-Id: I8e5b8c75031102cdd14605d336028ab3dbfa7e9c
2019-08-26 12:16:02 -07:00
markchien
17100fbdaa Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours
am: 335491989f -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 dd32bb52f7 is in history

Change-Id: I6d31b4d1c94057cf0ad1904374841a71e2042f24
2019-08-26 12:13:59 -07:00
Android Merger
6bc025004b Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev 2019-08-26 18:56:14 +00:00
Chalard Jean
b50dd23f95 Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev
am: 28dbc1ff07

Change-Id: Ia10e54a5e4afe88df0a4f0f18136ad67021f48cb
2019-08-26 11:56:05 -07:00
Android Merger
335491989f Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history" into oreo-cts-dev 2019-08-26 18:55:30 +00:00
markchien
0619ed30a2 [automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev
am: 63dda3513d -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history

Change-Id: I9b3f5d162a2bf1b5e576af496f6b4428b3aaa0f4
2019-08-26 11:55:21 -07:00
Android Merger
28dbc1ff07 Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev 2019-08-26 18:38:33 +00:00
Chalard Jean
dbafd34852 Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev
am: af4499cf45

Change-Id: Id99d972fa4d54a1f73ca11d9d1a8482fc35c9ea7
2019-08-26 11:38:25 -07:00
Android Merger
63dda3513d Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev 2019-08-26 18:37:58 +00:00
markchien
0d6a32a571 Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev
am: 873f2d8aa3

Change-Id: Ib9749b290a9cc943f441457b22f660cbe2b85b3b
2019-08-26 11:37:49 -07:00
Android Build Merger (Role)
6e8980ff08 [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 am: 080280ebff am: 8f5db6ef71
Change-Id: I28a1f16516d3d3936d49dd7dfaa4438eef0e217a
2019-08-24 03:32:20 +00:00
Android Build Merger (Role)
8f5db6ef71 [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 am: 080280ebff
Change-Id: Ieba241f8b9fdf26368f0648fc091c3a648fd0892
2019-08-24 03:32:17 +00:00
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

Change-Id: I4036de2d4a1ccd190c559b95470fdab09cb948c0
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)

Change-Id: If544089eb79801cad7660f3f419fa304387fc402
2019-08-23 09:49:42 +00:00
Android Build Merger (Role)
55b8c84793 [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 am: f611b30669 am: c55b04351c
Change-Id: I1e40b4240b8639860c5db001a251f28a436037c4
2019-08-21 08:10:57 +00:00
Android Build Merger (Role)
c55b04351c [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 am: f611b30669
Change-Id: I1b7d83a42bd6b8ae28daae974d8d751d11dbec20
2019-08-21 08:10:50 +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

Change-Id: I4a659f2c16358a59a1ab981e74e0b6592fbb0a76
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)
13a268e886 [automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3 am: c4031da617 am: 1635ad610f am: 21e123fdf6 am: 9ee527d848 skipped: ca53691112
Change-Id: I6ac7579f1b95830997c573afa5f0241161c7c0ed
2019-07-29 02:08:46 +00:00
Android Build Merger (Role)
ca53691112 [automerger] Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3 am: c4031da617 am: 1635ad610f am: 21e123fdf6 am: 9ee527d848
Change-Id: I26195a3e5bc6146eedc178830055633d115a5c24
2019-07-29 02:07:59 +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)
d66e639f31 [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 am: 5530604a47 am: 7dc43d91c4
Change-Id: I428b1ee7884c4177062279b5fb600c9fc239bee5
2019-07-08 19:24:16 +00:00
Android Build Merger (Role)
7dc43d91c4 [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 am: 5530604a47
Change-Id: I9914b8be6955431a5f2340716d018d236f709dd1
2019-07-08 19:24:10 +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

Change-Id: I6f2775a58f5c72effd7d04e031abb61df569dbb3
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
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