android-build-team Robot
e1ee833d76
Snap for 5821701 from 929d37ce36e5644befcf3c272901ca02002808b9 to qt-c2f2-release
...
Change-Id: Iee003096e000361a1e1285c3db50ad6ed168b2bf
2019-08-22 03:25:21 +00: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
android-build-team Robot
19ea06e2d0
Snap for 5820048 from b778ab29c0 to qt-c2f2-release
...
Change-Id: I5bbfc8254026b58229328e123f4d73a4e950dc40
2019-08-21 21:15:18 +00: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
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
android-build-team Robot
e257c6f5eb
Snap for 5811895 from c31438228a29d31e5472e4f7a39815148f5481b4 to qt-c2f2-release
...
Change-Id: I2b3d659e0e45b6668c8a78c8e4151223ee12fdaf
2019-08-19 00:43:42 +00: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
android-build-team Robot
c0e54d1d4d
Snap for 5803801 from c6d098fc109bf4ec15eff4de2ad61c8a7a91740a to qt-c2f2-release
...
Change-Id: I2ae303d182b4debe1c2857a1c892219003b7bd5d
2019-08-15 02:38:36 +00: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-team Robot
7e98ae2b11
Snap for 5778854 from fe69054f3df52d33146ebdc9815540014edf69ec to qt-c2f2-release
...
Change-Id: I90cad52916e90834ed6b818626a7cae5bfd409bb
2019-08-03 23:13:28 +00: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
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-team Robot
1e5490f9c0
Snap for 5719479 from 0300f18d862046ac05e9c6a0f58ff44d36bef7a5 to qt-c2f2-release
...
Change-Id: I11721291c0fe758c6fc6ecceeb4c2538ab9b17e6
2019-07-11 03:14:05 +00:00
junyulai
f8f32911db
[automerger skipped] Merge "Resolve resource ID at runtime to stabilize tests" into qt-dev
...
am: 288024db115764173a9f
2019-07-10 14:56:06 -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
android-build-team Robot
04c4fe7f6c
Snap for 5713143 from f25edf4b9318d2c347e01305d8b6da8b3cafe583 to qt-c2f2-release
...
Change-Id: Id70d84a23c966a5cc8669cb137a8adf0c87b1347
2019-07-09 03:06:08 +00:00
Lorenzo Colitti
06f11f519f
[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:39 -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
Lorenzo Colitti
6b43dd2a19
[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: c37cc1e4f13a984ca812
2019-07-08 12:57:09 -07:00
Lorenzo Colitti
c37cc1e4f1
[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: d66e639f313a984ca812
2019-07-08 12:43:04 -07: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
