Automerger Merge Worker
1cf0cdc817
Merge "[automerger skipped] Reset vpn provision status am: c5bad6f58c am: 7261013f7a am: 83d9687c0e -s ours" into rvc-qpr-dev-plus-aosp
2020-06-09 09:05:01 +00:00
Treehugger Robot
bd246d984c
[automerger skipped] Reset vpn provision status am: c5bad6f58c am: 7261013f7a am: 83d9687c0e -s ours
...
am skip reason: Change-Id I4856cfc7ddfd70125c513a4201132256704d1a66 with SHA-1 abf0c1d1e6 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11801424
Change-Id: I7d3ad003ea1dc1e8932631578e10c1d9dcdd4531
2020-06-09 09:04:55 +00:00
Treehugger Robot
3841f4c763
[automerger skipped] Reset vpn provision status am: c5bad6f58c am: 7261013f7a -s ours am: b5909f7220 -s ours
...
am skip reason: Change-Id I4856cfc7ddfd70125c513a4201132256704d1a66 with SHA-1 abf0c1d1e6 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11801424
Change-Id: I000a409eb0d5ec6ee66f8a53294db37bbd63322d
2020-06-09 09:04:51 +00:00
Treehugger Robot
b5909f7220
[automerger skipped] Reset vpn provision status am: c5bad6f58c am: 7261013f7a -s ours
...
am skip reason: Change-Id I4856cfc7ddfd70125c513a4201132256704d1a66 with SHA-1 abf0c1d1e6 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11801424
Change-Id: I95be1964332b49b1e1a141d0470e967e83d3c331
2020-06-09 08:49:22 +00:00
Treehugger Robot
7261013f7a
Reset vpn provision status am: c5bad6f58c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11801424
Change-Id: I821c6be56bb6c69f61d6c92385649ab9436a1eed
2020-06-09 08:35:35 +00:00
Treehugger Robot
c5bad6f58c
Reset vpn provision status
...
The vpn status of cts app is updated to be consented in this
tests which will impact the following test related to vpn.
Thus, reset the status after finishing the test.
Bug: 153760253
Test: atest CtsNetTestCasesLatestSdk
Merged-In: I4856cfc7ddfd70125c513a4201132256704d1a66
Change-Id: I4856cfc7ddfd70125c513a4201132256704d1a66
2020-06-09 05:40:49 +00:00
Treehugger Robot
3b993f9a01
Merge "Reset vpn provision status" am: 5469352727 am: 43f52399ac am: 59a0c3d13a am: 1909149362
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1323343
Change-Id: I16c1d329491229af9fca4a2a3306360343650f26
2020-06-09 04:53:05 +00:00
Treehugger Robot
1909149362
Merge "Reset vpn provision status" am: 5469352727 am: 43f52399ac am: 59a0c3d13a
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1323343
Change-Id: I3431c5dd22fa6b33efa62a6cb96140712bf83e74
2020-06-09 04:40:32 +00:00
Treehugger Robot
59a0c3d13a
Merge "Reset vpn provision status" am: 5469352727 am: 43f52399ac
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1323343
Change-Id: Ie8b6133774c1539d6c733f7c928957592f304404
2020-06-09 04:26:48 +00:00
Treehugger Robot
43f52399ac
Merge "Reset vpn provision status" am: 5469352727
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1323343
Change-Id: I30310a7fe18cb364afb6bf28ba371ce473a4ed61
2020-06-09 04:16:14 +00:00
Treehugger Robot
5469352727
Merge "Reset vpn provision status"
2020-06-09 04:06:06 +00:00
Xin Li
6809f5f6bd
[automerger skipped] Merge changes from topic "QQ3A.200605.002_merge" am: cacd78fef9 am: c149919936 -s ours am: c5eb29a331 -s ours am: 592d8955eb -s ours
...
am skip reason: Change-Id I0bffe618276cda41bac56efe069121073aa39930 with SHA-1 cb7066ef20 is in history
Original change: https://android-review.googlesource.com/c/platform/cts/+/1325311
Change-Id: Ie64616901a7feb21280c8eed55e034aa796c0de3
2020-06-08 16:42:43 +00:00
Xin Li
592d8955eb
[automerger skipped] Merge changes from topic "QQ3A.200605.002_merge" am: cacd78fef9 am: c149919936 -s ours am: c5eb29a331 -s ours
...
am skip reason: Change-Id I0bffe618276cda41bac56efe069121073aa39930 with SHA-1 cb7066ef20 is in history
Original change: https://android-review.googlesource.com/c/platform/cts/+/1325311
Change-Id: Ia883b3ab30e96c89027e5805fb61239c38c187fa
2020-06-08 16:30:00 +00:00
Xin Li
c5eb29a331
[automerger skipped] Merge changes from topic "QQ3A.200605.002_merge" am: cacd78fef9 am: c149919936 -s ours
...
am skip reason: Change-Id I0bffe618276cda41bac56efe069121073aa39930 with SHA-1 cb7066ef20 is in history
Original change: https://android-review.googlesource.com/c/platform/cts/+/1325311
Change-Id: Ia22e9f76e718119badf651718cbefcc52e15ebf1
2020-06-08 16:08:40 +00:00
Xin Li
c149919936
Merge changes from topic "QQ3A.200605.002_merge" am: cacd78fef9
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1325311
Change-Id: Ibfbcf71f7297bf8b13a147e4d72c7fa63eb52c0e
2020-06-08 15:57:25 +00:00
TreeHugger Robot
4e8cb25079
[automerger skipped] Merge "Add CtsNetTestCasesLatestSdk to postsubmit" into rvc-dev am: c78c56d686 -s ours am: 6b63136923 -s ours am: 0c6e8bee9b -s ours
...
am skip reason: Change-Id I48b2b5490d3fd5eb6f9456825c11f3fee0ec5b67 with SHA-1 f0a78c385d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11746988
Change-Id: Id67aee84498e00b8702d9c0fc8eb9474badc5553
2020-06-06 09:22:52 +00:00
TreeHugger Robot
f154b7c23e
[automerger skipped] Merge "Add CtsNetTestCasesLatestSdk to postsubmit" into rvc-dev am: c78c56d686 am: cae21ba96c -s ours am: 0ecd108ccd -s ours
...
am skip reason: Change-Id I48b2b5490d3fd5eb6f9456825c11f3fee0ec5b67 with SHA-1 f33b6ea261 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11746988
Change-Id: I3d3e2fa3f34a29041dab2625e046d6c3960da752
2020-06-06 09:22:35 +00:00
TreeHugger Robot
0c6e8bee9b
[automerger skipped] Merge "Add CtsNetTestCasesLatestSdk to postsubmit" into rvc-dev am: c78c56d686 -s ours am: 6b63136923 -s ours
...
am skip reason: Change-Id I48b2b5490d3fd5eb6f9456825c11f3fee0ec5b67 with SHA-1 f0a78c385d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11746988
Change-Id: I28fe067f9d34644017c44dc3802f48f194389d19
2020-06-06 09:06:30 +00:00
TreeHugger Robot
0ecd108ccd
[automerger skipped] Merge "Add CtsNetTestCasesLatestSdk to postsubmit" into rvc-dev am: c78c56d686 am: cae21ba96c -s ours
...
am skip reason: Change-Id I48b2b5490d3fd5eb6f9456825c11f3fee0ec5b67 with SHA-1 f33b6ea261 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11746988
Change-Id: I8dd95b970c1dd3a7f9e7b27a3eeb782642abd249
2020-06-06 09:05:57 +00:00
TreeHugger Robot
6b63136923
[automerger skipped] Merge "Add CtsNetTestCasesLatestSdk to postsubmit" into rvc-dev am: c78c56d686 -s ours
...
am skip reason: Change-Id I48b2b5490d3fd5eb6f9456825c11f3fee0ec5b67 with SHA-1 f33b6ea261 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11746988
Change-Id: I44d1bf6915c59fa9e3f5e1cde86cb3b0c92c0f7e
2020-06-06 08:47:07 +00:00
TreeHugger Robot
cae21ba96c
Merge "Add CtsNetTestCasesLatestSdk to postsubmit" into rvc-dev am: c78c56d686
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11746988
Change-Id: I79b75e888c5eb4506977df935e9e053bf0e887b3
2020-06-06 08:46:52 +00:00
Xin Li
cacd78fef9
Merge changes from topic "QQ3A.200605.002_merge"
...
* changes:
Convert Android.mk to Android.bp for CVE-2018-9536
Merge QQ3A.200605.002 into master
2020-06-06 01:41:30 +00:00
Lucas Lin
541283852a
Merge "Enlarge the onAvailable callback timeout to 30 seconds" am: fbf126a6f8 am: 5bf0181b36 am: 40e0cc42c8 am: d49e46f818
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1324092
Change-Id: I6e6160c3e0e2de10fd0534efa091256be0dedf8d
2020-06-05 09:45:10 +00:00
Lucas Lin
d49e46f818
Merge "Enlarge the onAvailable callback timeout to 30 seconds" am: fbf126a6f8 am: 5bf0181b36 am: 40e0cc42c8
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1324092
Change-Id: I506520729f1daca870ca60913aed914e38a13d14
2020-06-05 09:35:27 +00:00
Lucas Lin
40e0cc42c8
Merge "Enlarge the onAvailable callback timeout to 30 seconds" am: fbf126a6f8 am: 5bf0181b36
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1324092
Change-Id: Id3e19e53bf62579f70dad1163fd90a3455025115
2020-06-05 09:19:38 +00:00
Lucas Lin
5bf0181b36
Merge "Enlarge the onAvailable callback timeout to 30 seconds" am: fbf126a6f8
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1324092
Change-Id: I334534979e0da49fd303c40e4d84cc5fdf498dc0
2020-06-05 09:08:06 +00:00
Lucas Lin
fbf126a6f8
Merge "Enlarge the onAvailable callback timeout to 30 seconds"
2020-06-05 08:53:49 +00:00
Treehugger Robot
f0a78c385d
Add CtsNetTestCasesLatestSdk to postsubmit
...
Also exclude some tests that cannot run on cuttlefish.
This is a first step to add the suite to presubmit. Having the test in
presubmit is essential to avoid regressions and keep it passing.
Bug: 158153057
Test: m CtsNetTestCases; this patch will provide postsubmit results
Original-Change: https://android-review.googlesource.com/1322430
Merged-In: I48b2b5490d3fd5eb6f9456825c11f3fee0ec5b67
Change-Id: I48b2b5490d3fd5eb6f9456825c11f3fee0ec5b67
2020-06-05 06:54:18 +00:00
Treehugger Robot
b356903fe2
Merge "Add CtsNetTestCasesLatestSdk to postsubmit" am: 10944b6376 am: a639a7b010 am: 617442586a am: 54f796a95a
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1322430
Change-Id: Ia7621195e359e3edefbe0d171772250e90deb02a
2020-06-05 05:27:14 +00:00
Treehugger Robot
54f796a95a
Merge "Add CtsNetTestCasesLatestSdk to postsubmit" am: 10944b6376 am: a639a7b010 am: 617442586a
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1322430
Change-Id: I007ca4457fe0d52344b31f0074420b033966fdc3
2020-06-05 05:14:16 +00:00
Treehugger Robot
617442586a
Merge "Add CtsNetTestCasesLatestSdk to postsubmit" am: 10944b6376 am: a639a7b010
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1322430
Change-Id: I89e20ae03411ea60f32af95d8983667cb7197746
2020-06-05 05:00:18 +00:00
Treehugger Robot
a639a7b010
Merge "Add CtsNetTestCasesLatestSdk to postsubmit" am: 10944b6376
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1322430
Change-Id: Id0b4cd8b3959f9600aaa31ad2e3b2500f7f9c29a
2020-06-05 04:48:13 +00:00
Treehugger Robot
10944b6376
Merge "Add CtsNetTestCasesLatestSdk to postsubmit"
2020-06-05 04:38:40 +00:00
lucaslin
072e96ebdf
Enlarge the onAvailable callback timeout to 30 seconds
...
Sometimes the device may take a long time to connect to the wifi,
try to enlarge the timeout to lower the fail rate of test.
Bug: 157391946
Test: atest CtsHostsideNetworkTests:com.android.cts.net.HostsideNetworkCallbackTests
Change-Id: Ie89936ecc2d70ee22dd312067ccedd2523e81855
2020-06-05 02:55:22 +00:00
Remi NGUYEN VAN
f33b6ea261
Add CtsNetTestCasesLatestSdk to postsubmit
...
Also exclude some tests that cannot run on cuttlefish.
This is a first step to add the suite to presubmit. Having the test in
presubmit is essential to avoid regressions and keep it passing.
Bug: 158153057
Test: m CtsNetTestCases; this patch will provide postsubmit results
Change-Id: I48b2b5490d3fd5eb6f9456825c11f3fee0ec5b67
2020-06-05 09:57:11 +09:00
Automerger Merge Worker
8018464724
Merge "[automerger skipped] Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" into rvc-dev am: 58d34adebc am: daec61776a -s ours" into rvc-d1-dev-plus-aosp am: b97181a899 -s ours
...
am skip reason: Change-Id I244b91bdd8708694fce9f10d92b8b6646d28188f with SHA-1 d1c80d7e20 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11718922
Change-Id: I9d34c6285a31a201f4f789380bd1fc793fc13ca3
2020-06-04 08:16:22 +00:00
TreeHugger Robot
1aab8d788b
[automerger skipped] Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" into rvc-dev am: 58d34adebc -s ours am: 64dc25dd63 -s ours am: 5b428fc11e -s ours
...
am skip reason: Change-Id I244b91bdd8708694fce9f10d92b8b6646d28188f with SHA-1 d1c80d7e20 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11718922
Change-Id: I74b21c65f39bcf556c914d601a6696137fe07c53
2020-06-04 08:15:36 +00:00
TreeHugger Robot
f8b770b3fd
[automerger skipped] Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" into rvc-dev am: 58d34adebc am: daec61776a am: c3e41fc23d -s ours
...
am skip reason: Change-Id I244b91bdd8708694fce9f10d92b8b6646d28188f with SHA-1 7deca3e618 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11718922
Change-Id: Id18aabd6efbafda10de4b6b94baaf65fc61849bc
2020-06-04 08:14:48 +00:00
Automerger Merge Worker
b97181a899
Merge "[automerger skipped] Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" into rvc-dev am: 58d34adebc am: daec61776a -s ours" into rvc-d1-dev-plus-aosp
2020-06-04 07:34:44 +00:00
TreeHugger Robot
2d2d07d883
[automerger skipped] Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" into rvc-dev am: 58d34adebc am: daec61776a -s ours
...
am skip reason: Change-Id I244b91bdd8708694fce9f10d92b8b6646d28188f with SHA-1 7deca3e618 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11718922
Change-Id: I689a6ec8630165c2d85bb1bf0a31e3c8a803f4fd
2020-06-04 07:34:35 +00:00
TreeHugger Robot
5b428fc11e
[automerger skipped] Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" into rvc-dev am: 58d34adebc -s ours am: 64dc25dd63 -s ours
...
am skip reason: Change-Id I244b91bdd8708694fce9f10d92b8b6646d28188f with SHA-1 7deca3e618 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11718922
Change-Id: I2936078f9c3249b1cc987886a72b0f394c44dffe
2020-06-04 07:34:28 +00:00
TreeHugger Robot
daec61776a
Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" into rvc-dev am: 58d34adebc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11718922
Change-Id: Ia662ab3b2f4f06f803bfc75d74662c6d39a1174c
2020-06-04 07:21:07 +00:00
TreeHugger Robot
64dc25dd63
[automerger skipped] Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" into rvc-dev am: 58d34adebc -s ours
...
am skip reason: Change-Id I244b91bdd8708694fce9f10d92b8b6646d28188f with SHA-1 7deca3e618 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11718922
Change-Id: I992c18a39392dd332996fb946716e240f70188d7
2020-06-04 07:21:04 +00:00
Chiachang Wang
abf0c1d1e6
Reset vpn provision status
...
The vpn status of cts app is updated to be consented in this
tests which will impact the following test related to vpn.
Thus, reset the status after finishing the test.
Bug: 153760253
Test: atest CtsNetTestCasesLatestSdk
Change-Id: I4856cfc7ddfd70125c513a4201132256704d1a66
2020-06-04 12:52:31 +08:00
Treehugger Robot
d1c80d7e20
Fix CtsNetUtils connectTo/disconnectFromWifi
...
connectToWifi needs to clear the wifi networks blacklist before calling
reconnect(), otherwise wifi may not reconnect if the previous network
was blacklisted.
disconnectFromWifi should not wait for a onLost callback if wifi was
already disconnected.
Test: atest CtsNetTestCasesLatestSdk:ConnectivityManagerTest
Test: atest CtsNetApi23TestCases
Bug: 150949391
Original-Change: https://android-review.googlesource.com/1322428
Merged-In: I244b91bdd8708694fce9f10d92b8b6646d28188f
Change-Id: I244b91bdd8708694fce9f10d92b8b6646d28188f
2020-06-04 03:08:34 +00:00
Treehugger Robot
27d3853cac
Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" am: d99c455167 am: fce5f45653 am: 29f0b1fc74 am: f723371c6c
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1322428
Change-Id: I743caa3a749825887b2d27be324d3fd300858556
2020-06-03 08:18:44 +00:00
Treehugger Robot
f723371c6c
Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" am: d99c455167 am: fce5f45653 am: 29f0b1fc74
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1322428
Change-Id: Iaca0686531b18ef4f8961803d3ab6548ccc7f433
2020-06-03 08:08:50 +00:00
Treehugger Robot
29f0b1fc74
Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" am: d99c455167 am: fce5f45653
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1322428
Change-Id: I09fe2f6d4ef6a20985cf662a616a2270002a4534
2020-06-03 07:54:49 +00:00
Treehugger Robot
fce5f45653
Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" am: d99c455167
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1322428
Change-Id: I0483ab9f30828c328be8d8edb2a12234a156f5f9
2020-06-03 07:42:11 +00:00
Treehugger Robot
d99c455167
Merge "Fix CtsNetUtils connectTo/disconnectFromWifi"
2020-06-03 07:21:49 +00:00