Treehugger Robot
ba61f51a7f
Merge "Fix MultinetworkApiTest fail problem in instant mode" am: 3475b733b5 am: 59fdc91b04 am: c0a62623af am: 86e056dd01
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1326955
Change-Id: I6e7e3f5dfbf8f5ca095ad6a2295a76358865493d
2020-06-11 01:21:32 +00:00
Treehugger Robot
86e056dd01
Merge "Fix MultinetworkApiTest fail problem in instant mode" am: 3475b733b5 am: 59fdc91b04 am: c0a62623af
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1326955
Change-Id: If1b729ffd81e05b2b225efa8ea097ca71a2a8ad3
2020-06-11 01:05:51 +00:00
Treehugger Robot
c0a62623af
Merge "Fix MultinetworkApiTest fail problem in instant mode" am: 3475b733b5 am: 59fdc91b04
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1326955
Change-Id: Icf0cd88cfb5bdcf18173c8464666a9055ae903a8
2020-06-11 00:52:33 +00:00
Treehugger Robot
59fdc91b04
Merge "Fix MultinetworkApiTest fail problem in instant mode" am: 3475b733b5
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1326955
Change-Id: I70b8832c7b00cff6d8f9154e4f5b97a3d2fc28de
2020-06-11 00:41:11 +00:00
Treehugger Robot
3475b733b5
Merge "Fix MultinetworkApiTest fail problem in instant mode"
2020-06-11 00:22:51 +00:00
Automerger Merge Worker
a6194a37e5
Merge "[automerger skipped] Merge "Enlarge the onAvailable callback timeout to 30 seconds" into rvc-dev am: c63627c23c am: ed74a8d386 -s ours" into rvc-d1-dev-plus-aosp am: 3d8cad3738 -s ours
...
am skip reason: Change-Id Ie89936ecc2d70ee22dd312067ccedd2523e81855 with SHA-1 bac55b7eeb is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11761870
Change-Id: I0706baf756708dcfc06822aeb91069145c78c4ba
2020-06-10 15:55:46 +00:00
TreeHugger Robot
fa6e40a137
[automerger skipped] Merge "Enlarge the onAvailable callback timeout to 30 seconds" into rvc-dev am: c63627c23c -s ours am: 4b9e8d6166 -s ours am: 3bb77e9b0a -s ours
...
am skip reason: Change-Id Ie89936ecc2d70ee22dd312067ccedd2523e81855 with SHA-1 072e96ebdf is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11761870
Change-Id: I1549360df521b97ca8bab150c850a1957629d93a
2020-06-10 15:55:25 +00:00
Automerger Merge Worker
3d8cad3738
Merge "[automerger skipped] Merge "Enlarge the onAvailable callback timeout to 30 seconds" into rvc-dev am: c63627c23c am: ed74a8d386 -s ours" into rvc-d1-dev-plus-aosp
2020-06-10 15:44:22 +00:00
TreeHugger Robot
04f8a4bc07
[automerger skipped] Merge "Enlarge the onAvailable callback timeout to 30 seconds" into rvc-dev am: c63627c23c am: ed74a8d386 -s ours
...
am skip reason: Change-Id Ie89936ecc2d70ee22dd312067ccedd2523e81855 with SHA-1 072e96ebdf is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11761870
Change-Id: I03b239a860d7d241fea76f3d3633637726b6c159
2020-06-10 15:44:17 +00:00
TreeHugger Robot
3bb77e9b0a
[automerger skipped] Merge "Enlarge the onAvailable callback timeout to 30 seconds" into rvc-dev am: c63627c23c -s ours am: 4b9e8d6166 -s ours
...
am skip reason: Change-Id Ie89936ecc2d70ee22dd312067ccedd2523e81855 with SHA-1 072e96ebdf is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11761870
Change-Id: I53c9c4398c528a29887392f18ed88ba11ff622d8
2020-06-10 15:44:14 +00:00
TreeHugger Robot
4b9e8d6166
[automerger skipped] Merge "Enlarge the onAvailable callback timeout to 30 seconds" into rvc-dev am: c63627c23c -s ours
...
am skip reason: Change-Id Ie89936ecc2d70ee22dd312067ccedd2523e81855 with SHA-1 072e96ebdf is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11761870
Change-Id: Iea063e207ceffc51cbd4fa157bd3074b0b5d38e8
2020-06-10 15:33:30 +00:00
TreeHugger Robot
ed74a8d386
Merge "Enlarge the onAvailable callback timeout to 30 seconds" into rvc-dev am: c63627c23c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11761870
Change-Id: I71633d19fafa6411d7b9146111ea7e51921a9010
2020-06-10 15:33:18 +00:00
TreeHugger Robot
c63627c23c
Merge "Enlarge the onAvailable callback timeout to 30 seconds" into rvc-dev
2020-06-10 15:21:05 +00:00
Treehugger Robot
ea5bca5dab
Merge "Fix tests that failed on devices without IPsec tunnel feature" am: 08a29ff260 am: fdf0db07d9 am: 0ec5b40aa5 am: 2d59aa499a
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1322980
Change-Id: I31a8a7cc40d112b3138217052574d9aded15991e
2020-06-09 20:09:09 +00:00
Treehugger Robot
2d59aa499a
Merge "Fix tests that failed on devices without IPsec tunnel feature" am: 08a29ff260 am: fdf0db07d9 am: 0ec5b40aa5
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1322980
Change-Id: Ide24a2eebade3f6cac480206cfe2076701790957
2020-06-09 19:53:28 +00:00
Treehugger Robot
0ec5b40aa5
Merge "Fix tests that failed on devices without IPsec tunnel feature" am: 08a29ff260 am: fdf0db07d9
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1322980
Change-Id: I640782fb9108b8bfa433517d3b424638af70993b
2020-06-09 19:51:56 +00:00
Treehugger Robot
fdf0db07d9
Merge "Fix tests that failed on devices without IPsec tunnel feature" am: 08a29ff260
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1322980
Change-Id: Ifbf0790825a9fa6e3e3d6ceca342037401985ce0
2020-06-09 19:41:19 +00:00
Treehugger Robot
08a29ff260
Merge "Fix tests that failed on devices without IPsec tunnel feature"
2020-06-09 18:56:32 +00:00
Luke Huang
23710588f9
Fix MultinetworkApiTest fail problem in instant mode
...
CtsNetUtils#storePrivateDnsSetting might require WRITE_SECURE_SETTINGS
permission to run.
Therefore, move it from setUp to only belong to the required test case.
Bug: 158538281
Test: run cts --include-filter "arm64-v8a CtsNetTestCases[instant]
android.net.cts.MultinetworkApiTest"
Change-Id: I8ecadd134824a4023a3c6e173d52ba088d46b103
2020-06-10 00:51:39 +08:00
Treehugger Robot
ccd337b2e4
[automerger skipped] Reset vpn provision status am: c5bad6f58c -s ours am: b1dcc631a1 -s ours am: 8a92afc464 -s ours
...
am skip reason: Change-Id I4856cfc7ddfd70125c513a4201132256704d1a66 with SHA-1 c5bad6f58c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11801424
Change-Id: I57a4e90baf27521ddd92a0e9330553682fb4fd5e
2020-06-09 09:05:10 +00:00
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
8a92afc464
[automerger skipped] Reset vpn provision status am: c5bad6f58c -s ours am: b1dcc631a1 -s ours
...
am skip reason: Change-Id I4856cfc7ddfd70125c513a4201132256704d1a66 with SHA-1 c5bad6f58c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11801424
Change-Id: Ie78fe68a746e3095c7e8056595fded8b0725f333
2020-06-09 08:50:07 +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
b1dcc631a1
[automerger skipped] Reset vpn provision status am: c5bad6f58c -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: I352193fb3d590fea4df970bb9e0f62dfe3076fa2
2020-06-09 08:36:00 +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
evitayan
ce3c9ae278
Fix tests that failed on devices without IPsec tunnel feature
...
Three tests failed when they try to set up IKE Session with a
tunnel mode Child SA and the device does not have ipsec tunnel
feature. This commit changed these tests to set up IKE Session
with a transport mode SA because 1) the logic these tests are
verifying is unrelated to the Child SA type and 2) using
transport mode make sure these tests run on all the devices.
Bug: 158268209
Test: CtsIkeTestCases, verified on taimen
Change-Id: I9a8c7f631f0e6e02492816e3fbf0d751017dc2b3
2020-06-08 11:07:02 -07: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
Lucas Lin
bac55b7eeb
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
Original-Change: https://android-review.googlesource.com/1324092
Merged-In: Ie89936ecc2d70ee22dd312067ccedd2523e81855
Change-Id: Ie89936ecc2d70ee22dd312067ccedd2523e81855
2020-06-08 03:54:48 +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