Xin Li
29cf52c2a4
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: 6139e416d3 -s ours
...
am: 19c5d9ef15
Change-Id: I08d07f2510f5388f1e8616621e7e60a90c621786
2019-08-23 21:18:31 -07:00
Xin Li
19c5d9ef15
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history
...
am: 6139e416d3 -s ours
am skip reason: subject contains skip directive
Change-Id: I902b1be081ec2efc3431bc5f8f89c9f7c79cc497
2019-08-23 20:25:32 -07: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
Maciej Zenczykowski
7fd3cd60f4
Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into qt-dev am: 86301dddcd
...
am: 70c8696751
Change-Id: Id319b325bba2a55035770a672efd6cdf43a7c12b
2019-08-21 18:23:11 -07:00
Maciej Zenczykowski
2e275c80fe
Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into qt-dev am: 86301dddcd
...
am: b559b8cd82
Change-Id: If2308d2b8caf1d1e4afbdfcf3d4e92079252b61f
2019-08-21 18:21:45 -07:00
Maciej Zenczykowski
70c8696751
Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into qt-dev
...
am: 86301dddcd
Change-Id: If8d3ffa40d5d56a6057fdf53432127d88fd39f64
2019-08-21 18:09:05 -07:00
Maciej Zenczykowski
b559b8cd82
Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into qt-dev
...
am: 86301dddcd
Change-Id: Ie40c609af50bb2718f8a7771201fcd6d9e28be25
2019-08-21 18:09:03 -07:00
Erik Kline
6ee1049428
Attempt "fix" the broken QUIC packet to be slightly less broken
...
Bug: 139403355
Merged-In: I372c0730c9bd5329761b5a74b38e0f743bfd8230
(cherry picked from commit d6af2b5225249b178ee69dc5bac9b40c46f08d76)
Change-Id: I2955a3f9e733a5e39813a26e4cd630f79ae144a0
2019-08-21 18:37:03 +00:00
Android Build Merger (Role)
41e66df99c
Merge "[automerger skipped] [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 am: 55b8c84793 am: 6c135ac35c am: 59e3425113 am: acc1c3ab97 -s ours am: e2cf372833 am: b778ab29c0 -s ours am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history" into qt-r1-dev-plus-aosp
2019-08-21 09:12:01 +00:00
Chalard Jean
5017ead2f7
[automerger skipped] [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 am: 55b8c84793 am: 6c135ac35c am: 59e3425113 am: acc1c3ab97 -s ours am: e2cf372833
...
am: b778ab29c0 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history
Change-Id: Ie7749c58f75cceb40221770513b1fe2af7142cb4
2019-08-21 02:11:34 -07:00
Chalard Jean
9d220a299b
[automerger skipped] [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 am: 55b8c84793 am: 6c135ac35c am: 59e3425113 am: acc1c3ab97 -s ours am: e2cf372833 -s ours
...
am: 60cceda538 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history
Change-Id: I6a5f4b0ac2a193902e8adfe397dd9a5c80eff3e9
2019-08-21 02:11:32 -07:00
Chalard Jean
60cceda538
[automerger skipped] [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 am: 55b8c84793 am: 6c135ac35c am: 59e3425113 am: acc1c3ab97 -s ours
...
am: e2cf372833 -s ours
am skip reason: change_id I9c938998b5e30f7d3994b410878b2af6a75f9b5a with SHA1 aa76b34ae8 is in history
Change-Id: I3a97316bcfa6c32418910cb00c22ab91ff4a3c22
2019-08-21 02:05:27 -07:00
Chalard Jean
b778ab29c0
[automerger skipped] [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 am: 55b8c84793 am: 6c135ac35c am: 59e3425113 am: acc1c3ab97 -s ours
...
am: e2cf372833
Change-Id: I7481fccb313d14d761b74cc96a10fb0d87b82af9
2019-08-21 02:05:22 -07:00
Chalard Jean
e2cf372833
[automerger skipped] [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 am: 55b8c84793 am: 6c135ac35c am: 59e3425113
...
am: acc1c3ab97 -s ours
am skip reason: SHA1 acc1c3ab97 skipped by user jchalard
Change-Id: I875c775b9144b02bb06cc69d1702f7e62170879b
2019-08-21 01:59:29 -07:00
Chalard Jean
acc1c3ab97
[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 am: 55b8c84793 am: 6c135ac35c
...
am: 59e3425113
Change-Id: I678f59522233aa41f55143cb6508b691c209b048
2019-08-21 01:34:42 -07:00
Chalard Jean
59e3425113
[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 am: 55b8c84793
...
am: 6c135ac35c
Change-Id: I3716bbe0bc6c575cb00bdec42540e11d89fb1d4f
2019-08-21 01:28:22 -07:00
Chalard Jean
6c135ac35c
[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
...
am: 55b8c84793
Change-Id: I61524d628dea28a95af19cb359c9bca6822eaa3f
2019-08-21 01:21:47 -07: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
Erik Kline
d66391fe0b
Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" am: 2ca4e142bf am: b15ec9f17d
...
am: a03e4a98ed
Change-Id: Id964bdef01759576c1e0f243af029c74ed172c73
2019-08-16 19:33:42 -07:00
Erik Kline
a03e4a98ed
Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" am: 2ca4e142bf
...
am: b15ec9f17d
Change-Id: I39c2f9c69eb467bd46333cb1c8eb4a6616af2ebf
2019-08-16 19:23:38 -07: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
markchien
8975d1e2d9
[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours am: 257e3faca3 -s ours am: 6591499e44 -s ours
...
am: 2082597684 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: Iefb8c868f47f04284823531148ae493fa710c0c3
2019-08-16 10:59:47 -07:00
markchien
89dab44695
[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours am: 257e3faca3 -s ours am: 6591499e44 -s ours
...
am: 75e1805b9f -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: Idc20c9ed3c587acd42320a29ab463fda5c87b9d2
2019-08-16 10:57:12 -07:00
markchien
75e1805b9f
[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours am: 257e3faca3 -s ours
...
am: 6591499e44 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: Ibb3f258d59790a89f0b949f799036474e6565b1e
2019-08-16 10:47:52 -07:00
markchien
2082597684
[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours am: 257e3faca3 -s ours
...
am: 6591499e44 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: Ief035b800d86e2e08af9f8488c4468f47b253071
2019-08-16 10:47:49 -07:00
markchien
6591499e44
[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into pie-cts-dev am: ffaed0bbc0 -s ours
...
am: 257e3faca3 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: I0a3f9ee8bfb0a20aefbed1eecdbdf95ff782c67d
2019-08-16 10:39:20 -07:00
markchien
257e3faca3
[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 d51ae5760d is in history
Change-Id: I513c89fadd93716b099f2b21f44ae47fb70516ec
2019-08-16 10:29:51 -07:00
Xin Li
021e62b2e3
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 6cd5b9c0bf -s ours
...
am: 4277dd9104
Change-Id: Ic4d6468230f6416d73f9ccbb0e46658e16f69126
2019-08-15 17:26:45 -07:00
Xin Li
4277dd9104
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master
...
am: 6cd5b9c0bf -s ours
am skip reason: subject contains skip directive
Change-Id: Ib68859d15f126ff660d52d7433cc74f7ff088940
2019-08-15 16:34:45 -07:00
Remi NGUYEN VAN
bbeac4d940
Merge "Add test for WifiInfo#getFrequency()" into qt-r1-dev
...
am: 3305d126d9
Change-Id: Ibf847860a407d6ad265fabd9dc901d08d4e93e26
2019-08-14 17:15:27 -07: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
Remi NGUYEN VAN
9c97c58656
Add test for WifiInfo#getFrequency()
...
Add getFrequency() to WifiInfoTest (along with other missing getters),
and test that it is consistent with ScanResult in ScanResultTest.
Test: atest android.net.wifi.cts.ScanResultTest
Fixes: b/138929469
Merged-In: I070b16661bc72a5c5035b0b227821b680d7d71ba
(cherry picked from commit 2d504956e63eefb0a6a90844d1d00b99c097891b)
Change-Id: Ie99011acbbe66e9088f73964fd0c39d640594011
2019-08-09 03:24:49 +00:00
Android Build Merger (Role)
ab39854307
Merge "[automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours am: ecaabe8f3e -s ours am: 9b319aa0ef -s ours am: e6bf3b799e -s ours am: 2c5ac01165 -s ours am: 6fe647716f -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history" into qt-r1-dev-plus-aosp
2019-08-01 04:34:38 +00:00
Mark Chien
a8fd69aa68
[automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours am: ecaabe8f3e -s ours am: 9b319aa0ef -s ours am: e6bf3b799e -s ours am: 2c5ac01165 -s ours
...
am: 6fe647716f -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: I90e82aa87ed8222f76fd7aee237d06e7b8528209
2019-07-31 21:34:17 -07:00
Mark Chien
c7a627f4a4
[automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours am: ecaabe8f3e -s ours am: 9b319aa0ef -s ours am: e6bf3b799e -s ours am: 2c5ac01165 -s ours
...
am: 5eaa7d029a -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: I3b1b501fe34c2d00c9af688e2cc58f2a2b4dbf63
2019-07-31 21:34:15 -07:00
Mark Chien
5eaa7d029a
[automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours am: ecaabe8f3e -s ours am: 9b319aa0ef -s ours am: e6bf3b799e -s ours
...
am: 2c5ac01165 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: I7fb5564c6a23c6824b3df17151ec1af0fc613b13
2019-07-31 21:23:24 -07:00
Mark Chien
6fe647716f
[automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours am: ecaabe8f3e -s ours am: 9b319aa0ef -s ours am: e6bf3b799e -s ours
...
am: 2c5ac01165 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: I1d24f04eaeb01f72b7448688a6c63c359f1a97c8
2019-07-31 21:23:23 -07:00
Mark Chien
2c5ac01165
[automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours am: ecaabe8f3e -s ours am: 9b319aa0ef -s ours
...
am: e6bf3b799e -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: I57a24748b4bb6abaa50a9ff43fffb235ce54d6c1
2019-07-31 21:11:24 -07:00
Mark Chien
e6bf3b799e
[automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours am: ecaabe8f3e -s ours
...
am: 9b319aa0ef -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history
Change-Id: Ia0a4c5b6dacdb18ddfeead56ebbc9d5d843f9a3d
2019-07-31 20:46:59 -07:00