Chalard Jean
37c92ec10c
Merge "[automerger skipped] Merge "Merge "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" into oreo-mr1-cts-dev am: acfa8b7bb7" into pie-cts-dev am: 3a915f2921 -s ours
...
am: 97c35de59aaa76b34ae8
2019-08-28 15:12:44 -07:00
markchien
ddbd12377c
Merge "Merge "Merge "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: 4f182df10a -s ours am: c347654003 -s ours
...
am: 0cfcb1a472de0f268f78
2019-08-28 15:10:41 -07:00
markchien
8fe93b6bda
Merge "Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: ddb681cafe -s ours
...
am: ddce521efade0f268f78
2019-08-28 14:24:50 -07:00
markchien
07e500dd00
Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours
...
am: 7ff168c7a1d51ae5760d
2019-08-28 13:56:23 -07:00
Sudheer Shanka
7732ee5a3c
[automerger skipped] Merge "Merge "Skip battery saver related tests on unsupported devices." into pie-cts-dev am: e3c9363b92"
...
am: c497b007cb802549c8de
2019-08-26 16:20:37 -07:00
Android Merger
97c35de59a
Merge "[automerger skipped] Merge "Merge "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" into oreo-mr1-cts-dev am: acfa8b7bb7" into pie-cts-dev am: 3a915f2921 -s ours am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history"
2019-08-26 22:52:33 +00:00
Chalard Jean
73480fc929
[automerger skipped] Merge "Merge "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" into oreo-mr1-cts-dev am: acfa8b7bb7" into pie-cts-dev
...
am: 3a915f2921aa76b34ae8
2019-08-26 15:52:22 -07:00
Android Merger
0cfcb1a472
Merge "Merge "Merge "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: 4f182df10a -s ours am: c347654003 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history"
2019-08-26 22:51:54 +00:00
markchien
e6e8603ce4
Merge "Merge "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: 4f182df10a -s ours
...
am: c34765400352b82e3312
2019-08-26 15:51:47 -07:00
Android Merger
ddce521efa
Merge "Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am: ddb681cafe -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history"
2019-08-26 22:38:50 +00:00
markchien
95359b77a5
Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours
...
am: ddb681cafe52b82e3312
2019-08-26 15:38:36 -07:00
Android Merger
7ff168c7a1
Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78 is in history"
2019-08-26 22:34:26 +00:00
markchien
71a8c22e67
[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev
...
am: ffaed0bbc0 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 de0f268f78
2019-08-26 15:34:18 -07:00
Android Merger
c497b007cb
Merge "Merge "Skip battery saver related tests on unsupported devices." into pie-cts-dev am: e3c9363b92"
2019-08-26 22:17:00 +00:00
Sudheer Shanka
981f30d9ea
Merge "Skip battery saver related tests on unsupported devices." into pie-cts-dev
...
am: e3c9363b92
Change-Id: I692bc3cae382dee7a0215871d3da658c87d45a5e
2019-08-26 15:16:49 -07:00
Android Merger
3a915f2921
Merge "Merge "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" into oreo-mr1-cts-dev am: acfa8b7bb7" into pie-cts-dev
2019-08-26 21:18:31 +00:00
Chalard Jean
cc2444de25
Merge "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" into oreo-mr1-cts-dev
...
am: acfa8b7bb7
2019-08-26 14:18:20 -07:00
Android Merger
c347654003
Merge "Merge "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: 4f182df10a -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history" into pie-cts-dev
2019-08-26 21:17:50 +00:00
markchien
b3c63b6961
Merge "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: 4f182df10a52b82e3312
2019-08-26 14:17:38 -07:00
Android Merger
ddb681cafe
Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history" into pie-cts-dev
2019-08-26 21:05:29 +00:00
markchien
8367edd304
Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours
...
am: 956b28af1352b82e3312
2019-08-26 14:05:15 -07:00
Android Merger
acfa8b7bb7
Merge "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" into oreo-mr1-cts-dev
2019-08-26 19:08:35 +00:00
Chalard Jean
d5c8e158bc
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
2019-08-26 12:08:22 -07:00
Android Merger
4f182df10a
Merge "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 d51ae5760d is in history" into oreo-mr1-cts-dev
2019-08-26 19:07:43 +00:00
markchien
c7e558b100
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: 335491989fd51ae5760d
2019-08-26 12:07:31 -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
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: 63dda3513dd51ae5760d
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
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
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
Xin Li
6139e416d3
DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history
...
Bug: 139893257
Change-Id: Ie7606689aeb65115246c98b28a8430f1522b4437
2019-08-23 15:37:52 +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
Erik Kline
b15ec9f17d
Merge "Attempt "fix" the broken QUIC packet to be slightly less broken"
...
am: 2ca4e142bf
Change-Id: I9764dcfe2268d2ba36cb1a530928fd01337a1ff0
2019-08-16 19:14:50 -07:00
Erik Kline
aa76b34ae8
Attempt "fix" the broken QUIC packet to be slightly less broken
...
Bug: 139403355
Signed-off-by: Erik Kline <ek@google.com >
Change-Id: I9c938998b5e30f7d3994b410878b2af6a75f9b5a
2019-08-17 00:33:03 +00:00
Xin Li
6cd5b9c0bf
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master
...
Bug: 134405016
Change-Id: I789be8c337f7542d7a3107642125aa40b2ba78fe
2019-08-14 12:04:53 -07:00
markchien
52b82e3312
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: 117194347
Test: - I solemnly swear I tested this conflict resolution
Change-Id: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
(cherry picked from commit de0f268f78
2019-08-09 12:45:45 +00: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
Julien Desprez
8ceae71f63
Merge "Mark module as "secondary_user" since it uncovered bug before"
...
am: a9a8bf6ae3
2019-07-16 15:28:48 -07:00
Treehugger Robot
a9a8bf6ae3
Merge "Mark module as "secondary_user" since it uncovered bug before"
2019-07-16 21:55:44 +00:00
Xin Li
b6be832837
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
...
am: 5000dc4dca
2019-07-10 21:19:46 -07:00
TreeHugger Robot
288024db11
Merge "Resolve resource ID at runtime to stabilize tests" into qt-dev
2019-07-10 21:39:17 +00:00
Xin Li
5000dc4dca
DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
...
Bug: 136196576
Change-Id: I51435cf03e91cb11ea8027b226f8dbf6eb2b1e73
2019-07-10 09:50:54 -07:00
android-build-team Robot
27b8409b39
Snap for 5622519 from 9954e55f3cdb63682fb59d8cbbd0a611b2bacc68 to pi-platform-release
...
Change-Id: Ib718f08062790b0a7553978410946e591c58a283
2019-07-08 23:33:57 +00:00
Lorenzo Colitti
4ec16da603
[automerger skipped] [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 am: d66e639f31 -s ours am: c37cc1e4f1 -s ours am: 6b43dd2a19 -s ours am: ac180af96d -s ours
...
am: 318b0296dd3a984ca812
2019-07-08 13:34:41 -07:00
Lorenzo Colitti
318b0296dd
[automerger skipped] [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 am: d66e639f31 -s ours am: c37cc1e4f1 -s ours am: 6b43dd2a19 -s ours
...
am: ac180af96d3a984ca812
2019-07-08 13:22:39 -07:00
Lorenzo Colitti
ac180af96d
[automerger skipped] [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 am: d66e639f31 -s ours am: c37cc1e4f1 -s ours
...
am: 6b43dd2a193a984ca812
2019-07-08 13:12:36 -07:00
