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: b778ab29c0aa76b34ae8
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: 60cceda538aa76b34ae8
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: e2cf372833aa76b34ae8
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
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: acc1c3ab97acc1c3ab97
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
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
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
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
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
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
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: 2082597684d51ae5760d
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: 75e1805b9fd51ae5760d
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: 6591499e44d51ae5760d
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: 6591499e44d51ae5760d
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: 257e3faca3d51ae5760d
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
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
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
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: 6fe647716fd51ae5760d
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: 5eaa7d029ad51ae5760d
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: 2c5ac01165d51ae5760d
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: 2c5ac01165d51ae5760d
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: e6bf3b799ed51ae5760d
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: 9b319aa0efd51ae5760d
2019-07-31 20:46:59 -07:00
Mark Chien
9b319aa0ef
[automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev am: 704a9a46d8 -s ours
...
am: ecaabe8f3ed51ae5760d
2019-07-31 20:34:15 -07:00
Mark Chien
ecaabe8f3e
[automerger skipped] Merge changes from topic "am-6bf6d04b-31af-4d11-9286-c78baea6dc7f" into oc-dev
...
am: 704a9a46d8 -s ours
am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d
2019-07-31 20:22:14 -07: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
