Commit Graph

5448 Commits

Author SHA1 Message Date
Treehugger Robot
cd011d8048 [automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c am: ef7d1e44ca -s ours
am skip reason: Change-Id I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b with SHA-1 24d8b8391e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: I0c9aad45309fa76f3945549ee8a1bed50d60f20f
2020-06-15 13:58:42 +00:00
Treehugger Robot
ef7d1e44ca Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001

Change-Id: Ic930dd7826e5ba1169374c278dc67ea4fa799447
2020-06-15 13:47:29 +00:00
TreeHugger Robot
b857d32541 Merge "Bump CtsNetTestCasesLatestSdk to target SDK 30." into rvc-dev am: d69d28f755 am: 6c56cf06e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11850382

Change-Id: I695a84987cea13bf59b2ff8cce98ae7874f6b92a
2020-06-15 11:50:55 +00:00
TreeHugger Robot
9ba6fb6829 Merge "Bump CtsNetTestCasesLatestSdk to target SDK 30." into rvc-dev am: d69d28f755 am: 9daa97c7d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11850382

Change-Id: I6e2482bc0b5ff958e72d78af33a2e54e77847d8e
2020-06-15 11:50:34 +00:00
Treehugger Robot
3abe36567c Fix CtsTetheringTest on devices without permanent softAp interfaces.
Normally stop wifi tethering flow would be:
Tethering#stopTethering -> WifiManager#stopSoftAp -> softAp disabled,
then have WIIF_AP_STATE_CHANGED intent -> stop IpServer and broadcast
TETHER_STATE_CHANGED intent. SoftAp is disabled before tethering stop.

Because tethering would shutdown the corresponding IpServer if it
observed the interface is removed. For those devices that softAp
interface would be removed when stop tethering, the flow may be
Tethering#stopTethering -> WifiManager#stopSoftAp -> softAp disabing,
softAp interface is removed -> tethering trigger stop IpServer and
broadcast TETHER_STATE_CHANGED intent -> -> softAp disabled, then wifi
broadcast WIIF_AP_STATE_CHANGED intent. In this case, tethering is
stopped ready before softap is disabled.
For this case, CtsTeteringTest would have race between two test cases.
If two case need to start wifi tethering for testing and stop wifi
tethering after finish testing.
The second test may suffer from startTethering fail problem due to
softAP is not disabled yet.
    E WifiService: Tethering is already active.

Bug: 157806780
Test: atest CtsTetheringTest

Original-Change: https://android-review.googlesource.com/1331096
Merged-In: I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b
Change-Id: I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b
2020-06-15 11:30:50 +00:00
TreeHugger Robot
9daa97c7d6 Merge "Bump CtsNetTestCasesLatestSdk to target SDK 30." into rvc-dev am: d69d28f755
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11850382

Change-Id: Ifcf2a6cc2ad2a5573a92aa936d17cb6518b61277
2020-06-15 11:25:23 +00:00
TreeHugger Robot
6c56cf06e3 Merge "Bump CtsNetTestCasesLatestSdk to target SDK 30." into rvc-dev am: d69d28f755
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11850382

Change-Id: Ia2411bfd6cf06012f9adcfd6294188ff79be1421
2020-06-15 11:25:10 +00:00
Lorenzo Colitti
53430127ec Bump CtsNetTestCasesLatestSdk to target SDK 30.
This is not necessary for the tests to be able to use APIs
introduced in R because they can already access hidden APIs.
But it is important to ensure that they are subject to whatever
new system behaviour is applied to SDK 30 apps.

Fix: 158839774
Test: treehugger
Test: atest CtsNetTestCasesLatestSdk has no new failures
Change-Id: Ic86fe84b28b5becc722903650f00e9ca7d6e5f3f
2020-06-15 11:24:02 +00:00
Treehugger Robot
d55432238a Merge "Fix CtsTetheringTest on devices without permanent softAp interfaces." am: 10f23078c1 am: 9d3ae2e188 am: 174f529ce4
Original change: https://android-review.googlesource.com/c/platform/cts/+/1331096

Change-Id: Ie138b7e5465bcd19b7804588c3068a6a3ab0ea1e
2020-06-15 10:37:02 +00:00
Treehugger Robot
174f529ce4 Merge "Fix CtsTetheringTest on devices without permanent softAp interfaces." am: 10f23078c1 am: 9d3ae2e188
Original change: https://android-review.googlesource.com/c/platform/cts/+/1331096

Change-Id: I0eb4c872456981e346d95d57bc2e69cc327342bf
2020-06-15 10:18:21 +00:00
Treehugger Robot
9d3ae2e188 Merge "Fix CtsTetheringTest on devices without permanent softAp interfaces." am: 10f23078c1
Original change: https://android-review.googlesource.com/c/platform/cts/+/1331096

Change-Id: I77c08e18837bd0d04744c4dd5b058c368e90f85d
2020-06-15 10:06:52 +00:00
Treehugger Robot
10f23078c1 Merge "Fix CtsTetheringTest on devices without permanent softAp interfaces." 2020-06-15 09:49:44 +00:00
markchien
24d8b8391e Fix CtsTetheringTest on devices without permanent softAp interfaces.
Normally stop wifi tethering flow would be:
Tethering#stopTethering -> WifiManager#stopSoftAp -> softAp disabled,
then have WIIF_AP_STATE_CHANGED intent -> stop IpServer and broadcast
TETHER_STATE_CHANGED intent. SoftAp is disabled before tethering stop.

Because tethering would shutdown the corresponding IpServer if it
observed the interface is removed. For those devices that softAp
interface would be removed when stop tethering, the flow may be
Tethering#stopTethering -> WifiManager#stopSoftAp -> softAp disabing,
softAp interface is removed -> tethering trigger stop IpServer and
broadcast TETHER_STATE_CHANGED intent -> -> softAp disabled, then wifi
broadcast WIIF_AP_STATE_CHANGED intent. In this case, tethering is
stopped ready before softap is disabled.
For this case, CtsTeteringTest would have race between two test cases.
If two case need to start wifi tethering for testing and stop wifi
tethering after finish testing.
The second test may suffer from startTethering fail problem due to
softAP is not disabled yet.
    E WifiService: Tethering is already active.

Bug: 157806780
Test: atest CtsTetheringTest

Change-Id: I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b
2020-06-15 13:42:40 +08:00
Treehugger Robot
7d3fca77e0 [automerger skipped] Fix MultinetworkApiTest fail problem in instant mode am: 791d142a98 -s ours am: 6eb4e0e759 -s ours
am skip reason: Change-Id I8ecadd134824a4023a3c6e173d52ba088d46b103 with SHA-1 23710588f9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11823248

Change-Id: I6e649c287e5b6ccde175b7a51335fd709631afdc
2020-06-11 04:27:20 +00:00
Treehugger Robot
f47880373f [automerger skipped] Fix MultinetworkApiTest fail problem in instant mode am: 791d142a98 am: 750eee8756 -s ours
am skip reason: Change-Id I8ecadd134824a4023a3c6e173d52ba088d46b103 with SHA-1 23710588f9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11823248

Change-Id: Ibc1d1673fa7c169da4df01d598b171c0350c7add
2020-06-11 04:26:57 +00:00
Treehugger Robot
750eee8756 Fix MultinetworkApiTest fail problem in instant mode am: 791d142a98
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11823248

Change-Id: Icd1c55fe090d77a2045adb1d00d38cfc0bc86212
2020-06-11 04:05:12 +00:00
Treehugger Robot
6eb4e0e759 [automerger skipped] Fix MultinetworkApiTest fail problem in instant mode am: 791d142a98 -s ours
am skip reason: Change-Id I8ecadd134824a4023a3c6e173d52ba088d46b103 with SHA-1 23710588f9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11823248

Change-Id: I5e620b4ed80b70b61120528dd42146befe86e86b
2020-06-11 04:05:12 +00:00
Treehugger Robot
791d142a98 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"

Merged-In: I8ecadd134824a4023a3c6e173d52ba088d46b103
Change-Id: Ic8fa1421b1092efdb011a124836d9f466a231f43
(cherry picked from commit 9451fdf5031d2de02ac9011696b56760ea4943a0)
2020-06-11 02:37:41 +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
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
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
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
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
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
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