Commit Graph

9952 Commits

Author SHA1 Message Date
Chalard Jean
2b9bcb7830 Add test for updating IKE about IP address changes
Bug: 269715746
Test: VpnTest
Change-Id: I2c3a7f0f0af193b5497beaff38d54a80020a7aa0
2023-04-14 12:22:46 +09:00
Chalard Jean
9d85c7aa4c Adjust tests for delay in restarting/migrating IKE
This patch only adjusts the existing tests for the change
in the companion patch. Actual tests will come as a followup
because this patch is already big enough.

Test: VpnTest
Bug: 269715746
Change-Id: I65542a8f4151b4857f1b3758b2cae887bfbfe261
2023-04-14 12:22:46 +09:00
chiachangwang
25c74bd250 Fix inexact argument type warning
Assign the corresponding VpnProfileState for the null argument.

The varargs parameter has type "VpnProfileState...".  It needs
to decide whether the implementation want the argument to be
treated as a single-element of type VpnProfileState or no
arguement. Otherwise, it will confuse the compiler and cause
warning.

Test: atest VpnTest
Change-Id: Ic1dee696bb50cd78849de4812fb46fd764b23c6e
2023-04-14 01:58:18 +00:00
Sudheer Shanka
f55188807d Call wait-for-broadcast-barrier before verifying network state.
Wait for all broadcasts to be dispatched before we verify apps
network blocked status has changed.

Bug: 275459047
Test: atest --rerun-until-failure 50 ./tests/cts/hostside/src/com/android/cts/net/HostsideNetworkPolicyManagerTests.java
Ignore-AOSP-First: wait-for-broadcast-barrier is not available in AOSP
Change-Id: I27f1fcd0b80d8f9a6afd05393d5fc8ce71c6b2d4
2023-04-13 20:41:27 +00:00
Treehugger Robot
dfabd6cff6 Merge "Include/exclude mDNS interfaces based on transport" am: 5864b59462 am: 70d1bfa552
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2490884

Change-Id: I83e1a2cd4ffa4701737d79278432ef300cd0c6a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 06:03:04 +00:00
Maciej Żenczykowski
46d8607245 Merge "bpf network stats - remove dead code" am: 93979804b7 am: cc4e33883f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2528044

Change-Id: I7efaed244b1e3e31fb85bde8fd122663b89a3fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 06:02:54 +00:00
Treehugger Robot
70d1bfa552 Merge "Include/exclude mDNS interfaces based on transport" am: 5864b59462
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2490884

Change-Id: I2f9c868d02a974dcfa784dfbcde7754007250f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 05:33:29 +00:00
Maciej Żenczykowski
cc4e33883f Merge "bpf network stats - remove dead code" am: 93979804b7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2528044

Change-Id: Ibd4a215319753672c985b54e0189cb63a3e3ec31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 05:33:13 +00:00
Treehugger Robot
5864b59462 Merge "Include/exclude mDNS interfaces based on transport" 2023-04-12 05:28:02 +00:00
Maciej Żenczykowski
93979804b7 Merge "bpf network stats - remove dead code" 2023-04-12 05:03:33 +00:00
Treehugger Robot
edb74b0117 Merge "Use consistent addresses in SSLCertificateSocketFactoryTest." am: 14e08ef40e am: 2628663f68
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2487883

Change-Id: I03ecf05fa58821f54d31297276d07052a01cb6fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 04:59:58 +00:00
Treehugger Robot
2628663f68 Merge "Use consistent addresses in SSLCertificateSocketFactoryTest." am: 14e08ef40e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2487883

Change-Id: I493bc481e79d191c2683028589512f797b6a0f37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 04:17:37 +00:00
Remi NGUYEN VAN
145b16cb5a Include/exclude mDNS interfaces based on transport
Regardless of IFF_MULTICAST (and IFF_BROADCAST), always include wifi
transport interfaces, and always exclude cellular transport interfaces.

Some interfaces do not have the multicast or broadcast flag set
properly. Use the transport to determine whether to use them, rather
than the interface flags.

Bug: 268138840
Test: atest MdnsSocketProviderTest
Change-Id: Idbddfa9d2cc05ce1850786aa634da4c38afd3fc0
2023-04-12 12:43:00 +09:00
Treehugger Robot
14e08ef40e Merge "Use consistent addresses in SSLCertificateSocketFactoryTest." 2023-04-12 03:40:01 +00:00
Maciej Żenczykowski
b548e191de bpf network stats - remove dead code
only the test code ever passes in anything that isn't
a limit {UID_ALL, INTERFACES_ALL, TAG_ALL} (ie. no limit)

Test: TreeHugger, atest libnetworkstats_test FrameworksNetTests
Bug: 276296921
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ida489f25c4da4b12541c6001b41d9e4b30804eff
2023-04-11 19:24:28 +00:00
Junyu Lai
e68c42b888 Check MAINLINE_NETWORK_STACK as well to make GTS can access proper stats
Follow up from aosp/1933093. The test failed because certain
devices use a flattened apex that lacks the NETWORK_STACK
permission for sharing with the GTS apk.
Additionally, the NetworkStatsAccess does not recognize the
GTS apk, which holds the MAINLINE_NETWORK_STACK permission.

Test: TH
Bug: 275532605
Change-Id: Icce80a3d3dbea4a84fbd369d9b5fbe0029ab463e
2023-04-11 14:56:15 +08:00
Treehugger Robot
e6927dc98b Merge "Fix flaky NsdManagerTest" am: e2a1dc74f4 am: cafadc6e5f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2512341

Change-Id: I3d0c29c8370fe91ab1ea26f174de1b352dde580a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 17:06:44 +00:00
Treehugger Robot
cafadc6e5f Merge "Fix flaky NsdManagerTest" am: e2a1dc74f4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2512341

Change-Id: Ic75de4d849a7b2b8f40001840f2f2b059bbc904e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 16:38:54 +00:00
Treehugger Robot
e2a1dc74f4 Merge "Fix flaky NsdManagerTest" 2023-04-07 16:02:41 +00:00
Paul Hu
a91c198134 Fix flaky NsdManagerTest
There is a race condition between socket connection succeeding
and interface returning a non-empty address list. So verify
that interface returns a non-empty list, before trying the
socket connection.

Bug: 272147547
Test: atest android.net.cts.NsdManagerTest --iteration 10
Change-Id: I7c7a03688ad6d8d76c741a99eeb74d28933986f1
2023-04-07 15:18:36 +08:00
Mark Chien
0e2f8be0c9 Merge "Ensure airplane mode take effect by checking softap status" am: 1860b17def am: 9925fd8a44
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2510558

Change-Id: I0b42e63cdfb188f4521e33863a4bd2dd10dae384
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 07:53:58 +00:00
Mark Chien
9925fd8a44 Merge "Ensure airplane mode take effect by checking softap status" am: 1860b17def
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2510558

Change-Id: Ic9ee6f54a68cb6120a1019f9ab95bc7174fc5bba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 07:23:01 +00:00
Mark Chien
1860b17def Merge "Ensure airplane mode take effect by checking softap status" 2023-04-06 07:03:14 +00:00
Mark
a885bd82bd Ensure airplane mode take effect by checking softap status
Previously, we check wifi settings to know whether airplane mode take
effect on wifi side or not. Now it doesn't work because wifi settings
may remain on while airplane mode was enabled. Thus, checking softap
status to make sure airplane mode take effect instead.

Bug: 261883975
Test: atest ConnectivityManagerTest#testFactoryReset
Change-Id: I78c80ec0fe8376605777f32898319b176151f58d
2023-04-06 02:47:35 +00:00
Yuyang Huang
04d523deb1 Merge "Avoid creating a Network with INetd.LOCAL_NET_ID" am: cf55b1ba5f am: a8b1d53a68
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2519918

Change-Id: I02b8d3e2373269545f5519ce1517053f9f7954d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 09:17:11 +00:00
Yuyang Huang
a8b1d53a68 Merge "Avoid creating a Network with INetd.LOCAL_NET_ID" am: cf55b1ba5f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2519918

Change-Id: I6a6ed3d27f71c00befda307c09a15c3c2097eda0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 08:50:04 +00:00
Yuyang Huang
cf55b1ba5f Merge "Avoid creating a Network with INetd.LOCAL_NET_ID" 2023-04-05 08:21:56 +00:00
Yuyang Huang
3bee9d4099 Avoid creating a Network with INetd.LOCAL_NET_ID
INetd.LOCAL_NET_ID cannot be referred to by system SDK. To make the
MdnsSocketProvider built with system SDK, the reference to
INetd.LOCAL_NET_ID must be removed.

This network is created in MdnsSocketProvider.java and propagated
through MdnsSocketProvider.java -> MdnsMultinetworkSocketClient.java ->
MdnsDiscoveryManager.java -> MdnsServiceTypeClient.java ->
NsdService.java. In NsdService.java, it was used in
handleMdnsDiscoveryManagerEvent() -> buildNsdServiceInfoFromMdnsEvent()
-> setServiceNetworkForCallback(). The setServiceNetworkForCallback() is
updated to handle the NETID_UNSET the same as LOCAL_NET_ID.

Test: atest CtsNetTestCases FrameworksNetTests
Bug: 272392042
Change-Id: I07c573948e9dc6249325f0733807bb7a7ffc281c
2023-04-05 13:06:13 +09:00
Patrick Rohr
949453ec7f Merge "ConnectivityManagerTest: skip testBlockedStatusCallback in instant mode" am: e4f8d49c81 am: f52a5e89e9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2523855

Change-Id: I05eec57fcbe3ea08440a471383b33aa9ca0b30d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 03:20:08 +00:00
Patrick Rohr
f52a5e89e9 Merge "ConnectivityManagerTest: skip testBlockedStatusCallback in instant mode" am: e4f8d49c81
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2523855

Change-Id: I1f7e100793581497bad8a2456da3564269fff06d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 02:51:39 +00:00
Patrick Rohr
0fd6c05541 ConnectivityManagerTest: skip testBlockedStatusCallback in instant mode
This test relies on WifiManager (since aosp/2344384) which is not
available in instant mode.

Test: TH
Bug: 262913254
Change-Id: Ic4fc58bda26baec2cb93a477d077787a755516e7
2023-04-04 22:00:31 +00:00
Treehugger Robot
0cbebf5e59 Merge "Add test to check socket close state after vpn connects" am: 57a3054e49 am: c5a0fce160
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2492636

Change-Id: I6273218b0075d54a47bd03a4ce1ac95de5a43057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 15:22:41 +00:00
Treehugger Robot
c5a0fce160 Merge "Add test to check socket close state after vpn connects" am: 57a3054e49
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2492636

Change-Id: I8b3b1a2a104bfebf8a8d197d89ef30b47bd2f56f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 14:55:44 +00:00
Treehugger Robot
57a3054e49 Merge "Add test to check socket close state after vpn connects" 2023-04-04 14:25:55 +00:00
Motomu Utsumi
3e5c53b864 Add test to check socket close state after vpn connects
Bug: 270298713
Test: atest com.android.cts.net.HostsideVpnTests
Change-Id: Id090eea877de1c8fb6d195429b7affdbfc2abb6a
2023-04-04 16:27:40 +09:00
Remi NGUYEN VAN
96054db62b Merge "Do not crash when passing null into buildTemplateMobileAll" am: 8a78f043ea am: bb0baa63eb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2510560

Change-Id: Ia953c32c4e260c0d8efc34ae8d82c0f33ae049ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 02:26:46 +00:00
Remi NGUYEN VAN
bb0baa63eb Merge "Do not crash when passing null into buildTemplateMobileAll" am: 8a78f043ea
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2510560

Change-Id: Ia5c253e01329b4ce7b95bf9490a2c3a1a57b0a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 01:58:34 +00:00
Remi NGUYEN VAN
8a78f043ea Merge "Do not crash when passing null into buildTemplateMobileAll" 2023-04-04 01:27:41 +00:00
Yan Yan
e5aed4c51e Merge "Retain subscription IDs on restricted test networks" am: 51db40f5e5 am: 5aed3bff05 am: 860598a6a4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2506442

Change-Id: I9e49ad24c24f30496945297ca3b7349ff40eac1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 05:04:41 +00:00
Yan Yan
815cedfcbb Merge "Retain subscription IDs on restricted test networks" am: 51db40f5e5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2506442

Change-Id: Ia0a32684c36081d8ad364b5105a8829480e35c95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 04:16:22 +00:00
Yan Yan
51db40f5e5 Merge "Retain subscription IDs on restricted test networks" 2023-03-31 03:44:15 +00:00
Treehugger Robot
de96c756b5 Merge "NsdService should set the Inet6Address scope ids" am: 2ea7c09148 am: e651a97425
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2495438

Change-Id: Ic557667ad7e44ef4728d1815eb110b70fddd259e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:15:19 +00:00
Yan Yan
157db69bf4 Merge changes I33e945f8,I9b5c9618 am: d1cafcd240 am: 81cba061ca
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2491018

Change-Id: I7328cea44039221b1d451264fb076fba999d53ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:14:39 +00:00
Yan Yan
9064ee95de Merge "Add allowed capabilities on non cellular test networks" am: d71f6efa89 am: 63df2d1b66 am: e607e8a4e0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2470461

Change-Id: I2dba5901aca1ff4283c7d1e122d258aa692dca5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:13:17 +00:00
Treehugger Robot
e651a97425 Merge "NsdService should set the Inet6Address scope ids" am: 2ea7c09148
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2495438

Change-Id: I73b76c61818313d69ee1b7ba1a0594640503f29e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 16:26:29 +00:00
Yan Yan
81cba061ca Merge changes I33e945f8,I9b5c9618 am: d1cafcd240
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2491018

Change-Id: Iccb8e0f4a14f1e3000f0a749f3bc8131beb72e9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 16:25:11 +00:00
Yan Yan
ad3e1f3b08 Merge "Add allowed capabilities on non cellular test networks" am: d71f6efa89
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2470461

Change-Id: I35f2fa55c34628cae9cd6556497b0d385c24339e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 16:23:18 +00:00
Treehugger Robot
2ea7c09148 Merge "NsdService should set the Inet6Address scope ids" 2023-03-30 09:57:10 +00:00
Yan Yan
966fb798a1 Retain subscription IDs on restricted test networks
Fix the bug where subscription IDs will be cleared
on a restricted test network

Bug: 263415068
Test: NetworkCapabilitiesTest
Change-Id: I977781cd81f9d86858bd264825d66a2a69f6ce53
2023-03-30 07:49:13 +00:00
Junyu Lai
2c12f922de Do not crash when passing null into buildTemplateMobileAll
Test: atest FrameworksNetTests:android.net.connectivity.android.net.NetworkTemplateTest
Test: atest FrameworksNetTests:android.net.connectivity.android.net.netstats.NetworkTemplateTest
Bug: 273963543
Change-Id: I0a8f94df124147e92d35cf474b3d69d1dee6902c
2023-03-30 13:59:02 +08:00