Commit Graph

10985 Commits

Author SHA1 Message Date
Mark Chien
8331999193 Merge "Restore presubmit of testSetOemNetworkPreferenceForTestOnlyPref" into main am: eb4e92c45d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2709079

Change-Id: I6b4e5051b6c845c73c43da735adc873ee875414f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 02:37:02 +00:00
Mark Chien
eb4e92c45d Merge "Restore presubmit of testSetOemNetworkPreferenceForTestOnlyPref" into main 2023-08-16 02:17:58 +00:00
Paul Hu
0f41116dbb Merge "Add testMobileDataPreferredUids back to presubmut" into main am: 290530b591
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2709177

Change-Id: I80347100d1ced550439afb27849742735a283b72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 02:11:19 +00:00
Paul Hu
290530b591 Merge "Add testMobileDataPreferredUids back to presubmut" into main 2023-08-16 01:26:54 +00:00
Paul Hu
7615075d12 Add sim card requirement for net permission tests
The network permission tests perform a connectivity check before
running, which means that a SIM card is required to check for
mobile data. However, there is no SIM card token sharding defined
in the AndroidTest.xml to make sure that the SIM card is
available for testing. Therefore, add the definition to the
AndroidTest.xml file.

Bug: 295708437
Bug: 295611982
Test: m
Change-Id: I20201ea8c7272771fdc59752aa2aae22b14d1e34
2023-08-15 09:40:58 +00:00
Chalard Jean
fa6ab01471 Restore presubmit of testSetOemNetworkPreferenceForTestOnlyPref
Mark fixed this test in aosp/2709233

Bug: 295829521
Test: Dashboard will stop showing this failure
Change-Id: I439d4b65b2fc5981af924fb1f1155273bdd52e7a
2023-08-15 18:17:51 +09:00
Chalard Jean
38d17785b2 Restore ConnectivityManagerTest into presubmits
These tests are no longer flaky.

Test: the dashboard shows no failure over the last 2 weeks
Bug: 292173706
Bug: 292174832
Change-Id: I2269596fd62328c54fff21238379d518d5bbd0cc
2023-08-15 09:14:25 +00:00
Mark Chien
021d19e024 Merge "Fix testSetOemNetworkPreferenceForTestOnlyPref flaky" into main am: 3a8ed26686
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2709233

Change-Id: Iee2b365dd8d70e5f65b347360993ca4c7952f6e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 08:53:10 +00:00
Paul Hu
504e488e51 Add testMobileDataPreferredUids back to presubmut
The testMobileDataPreferredUids was disabled from presubmit
because of flaky test. It's no longer flaky now, so add the test
back to presubmit.

Fix: 292174275
Test: atest android.net.cts.ConnectivityManagerTest\
      #testMobileDataPreferredUids --iterations 1000
Change-Id: I191888069a00942aa4c82f62bd1d62b7fc70b4fa
2023-08-15 08:46:11 +00:00
Mark Chien
3a8ed26686 Merge "Fix testSetOemNetworkPreferenceForTestOnlyPref flaky" into main 2023-08-15 08:20:15 +00:00
Chiachang Wang
071e7a8eaa Merge "Ensure test network being torn down" into main am: 29d3ea96f3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2705540

Change-Id: I6e416231ab995705c1b640cf856767ebc588c621
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 08:08:01 +00:00
Chiachang Wang
29d3ea96f3 Merge "Ensure test network being torn down" into main 2023-08-15 07:21:41 +00:00
Mike Yu
408e60d23a Merge "Add connectivity pre-check for CtsNativeNetDnsTestCases" into main am: ededcdcf88
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2705543

Change-Id: I72df40b4169bc504b184c15b341693a81464d266
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 07:01:46 +00:00
Chalard Jean
c33eafb464 Request enterprise networks
...so they don't disconnect in the middle of the test

Test: strategically add a sleep to reproduce the failure
      apply the patch, observe the test passing with the sleep
Bug: 293844884
Change-Id: I4388e151d886461ca44185639e292ccd9795c50e
2023-08-15 15:14:57 +09:00
Mark
113e5a977a Fix testSetOemNetworkPreferenceForTestOnlyPref flaky
There may be additional CapabilitiesChanged callbacks before
the test network is torn down. To verify ON_LOST, use
eventuallyExpect instead of expect.

Bug: 295829521
Test: atest ConnectivityManager#testSetOemNetworkPreferenceForTestOnlyPref
Change-Id: I24bb11bf2c2da08e5757c845beeb35b7004f25a4
2023-08-15 05:53:28 +00:00
chiachangwang
c9b03fa9ed Ensure test network being torn down
Ikev2VpnTest uses TestNetworkRunnable to start test networks
to perform VPN related tests. In some low performance devices,
such as cuttlefish, the request to disconnect test network
at the end of the previous test may not be executed completely
yet. It results in the disconnect-pending network being used
by the follow-up test and fail the test. To fix this, the utility
method should wait for onLost callback before performing next
test.

Bug: 293239828
Test: atest CtsNetTestCases:android.net.cts.Ikev2VpnTest \
      --rerun-until-failure 100
Change-Id: I6f3c4f45d3dbadc7e8783c05d6cf67f0896ffa95
2023-08-15 05:21:29 +00:00
Mike Yu
784ff2fb9a Add connectivity pre-check for CtsNativeNetDnsTestCases
This test is run by resolver MTS and it should pre-check device
connectivity before running. The reason why the test never or
seldom failed in the past is probably that it usually ran after
CtsNetTestCasesLatestSdk DnsResolverTest (which is also run by
resolver MTS) that already pre-checked the connectivity.

Bug: 291495329
Test: atest CtsNativeNetDnsTestCases
Change-Id: I20159029c7e68e9c21dcb6e7bbf221cda39117a5
2023-08-15 01:46:01 +00:00
Remi NGUYEN VAN
0d75d977a2 Add tests for conflicts
Add end-to-end testing for conflicts happening during and after probing.

This includes making sure that interfaces have a usable IPv6 address
before starting each test, as mdnsresponder would not probe on the
interface if the address is not present, and would go straight to
advertising otherwise.

Bug: 266151066
Test: atest NsdManagerTest
Change-Id: Ie1a1e888afbcd5c1bafaf218a98ac4c2f5fe63ee
2023-08-14 15:02:54 +08:00
Treehugger Robot
2166f7954a Merge "update bpf_existence_test to enforce minimum kver" into main am: 713cb071e0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2700897

Change-Id: Ifbe4b30d7e056bcc1a4a494925f219a53c4d8e3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10 13:49:31 +00:00
Treehugger Robot
713cb071e0 Merge "update bpf_existence_test to enforce minimum kver" into main 2023-08-10 13:04:47 +00:00
Treehugger Robot
296f46f929 Merge "Fix flaky test: testNsdManager_registerOffloadEngine" into main am: 6f1da9b479
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2702733

Change-Id: I69318a949939800949c42173552e979200a10666
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10 10:02:01 +00:00
Treehugger Robot
6f1da9b479 Merge "Fix flaky test: testNsdManager_registerOffloadEngine" into main 2023-08-10 09:35:33 +00:00
Paul Hu
fb5179a0bb Merge "Fix NullPointerException on NsdService" into main am: d45bf5499f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2700853

Change-Id: I91f094f1a54c7c4990ca038fb5ffff0a01230462
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10 09:33:11 +00:00
Paul Hu
d45bf5499f Merge "Fix NullPointerException on NsdService" into main 2023-08-10 09:03:41 +00:00
Yuyang Huang
40f958b90d Fix flaky test: testNsdManager_registerOffloadEngine
Fix flaky test by only catch relevant the AddOrUpdateEvent and
RemoveEvent.

Bug: 294685851
Test: atest CtsNetTestCases
Change-Id: Ia12e51a6527f1e23610fdb0bea1068ebb5b80a73
2023-08-10 16:30:09 +09:00
Paul Hu
101dbf5262 Fix NullPointerException on NsdService
The NsdService will throw a NPE if a new client is registered
with a null INsdManagerCallback object. To avoid this, perform
a null check before registering a new client and throw an
IllegalArgumentException if the callback is null.

Bug: 293285797
Test: atest FrameworksNetTests
Change-Id: Id61e27873591031c3fe383879aee0d40eebc08b3
2023-08-10 14:19:01 +08:00
Maciej Żenczykowski
c71dfae7df update bpf_existence_test to enforce minimum kver
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ibcb4fd53b0bbb04dc52f9fcbb5ab6bdae9efe02c
2023-08-09 21:48:51 +00:00
Colin Cross
4e5a061f26 Fix kotlin nullable errors in Connectivity tests
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
Change-Id: Id49e4a2ee0b7b463d99bce6eb22919b84c21443a
2023-08-09 10:57:35 -07:00
Patrick Rohr
dbe0fd3f53 ethernet: use TrackRecord backtrace for better failure logs
Test: atest EthernetManagerTest
Change-Id: Ifcc038281164b0d840bfc52524e7ac4d32c640a0
2023-08-09 05:46:46 -07:00
Patrick Rohr
4dc2533986 ethernet: correctly report tethering interface state
EthernetNetworkFactory does not track interfaces in server mode; use
EthernetTracker#getInterfaceState() instead.

Bug: 241070589
Test: atest EthernetManagerTest
Change-Id: Id68f2ae8b30dd5bacef09b828692a9692c6dba75
2023-08-09 05:45:52 -07:00
Patrick Rohr
a189e9eae0 ethernet: add missing assert in eventuallyExpect helper
eventuallyExpect(CallbackEntry) was missing an assertNotNull, which
essentially made it a no-op.

Bug: 241070589
Test: atest EthernetManagerTest
Change-Id: I0ebf54bc9b7ae8a5de59f2bc302b06747174d4ea
2023-08-09 02:46:44 -07:00
Junyu Lai
667c892fc5 Merge "Fix flaky test: testDataMigration_differentFromFallback" into main am: ef0afdef0e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2697015

Change-Id: I34107339d44d6cbeec7576e11e0dadf91355e8b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 09:44:35 +00:00
Junyu Lai
ef0afdef0e Merge "Fix flaky test: testDataMigration_differentFromFallback" into main 2023-08-09 08:53:46 +00:00
Treehugger Robot
f70324a251 Merge "Allow VPN lockdown UID ranges to stack properly" into main am: b15f7d1e68
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2634910

Change-Id: I06c1bbf183433e575cfa2385228b8f93751d44a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 08:38:56 +00:00
Treehugger Robot
b15f7d1e68 Merge "Allow VPN lockdown UID ranges to stack properly" into main 2023-08-09 08:05:20 +00:00
Junyu Lai
353ec97c64 Fix flaky test: testDataMigration_differentFromFallback
Test main thread mocked settings object but use that on the handler
thread as well, which is not thread-safe.
Create a real object instead of mocking it instead.

Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.net.NetworkStatsServiceTest#testDataMigration_differentFromFallback \
      --rerun-until-failure 500
Fix: 289705810
Change-Id: Ibfb722818467fdf2b69a4b8fa87b4ac04a713573
2023-08-09 14:44:23 +08:00
Treehugger Robot
66b73d3518 Merge "Use destroyLiveTcpSocketsByOwnerUids for frozen apps" into main am: b7d3f3fd77
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2608567

Change-Id: I2ff8123f989213d10de770509bb3a25788afc15d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 06:06:41 +00:00
Treehugger Robot
b7d3f3fd77 Merge "Use destroyLiveTcpSocketsByOwnerUids for frozen apps" into main 2023-08-09 05:17:14 +00:00
Chiachang Wang
ea46c3001b Merge "Add VpnTest back to presubmut" into main am: f574524c0b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2696894

Change-Id: I1ac342d94f2851d8298997a2e88b37fdc2fb024e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 09:20:20 +00:00
Chiachang Wang
f574524c0b Merge "Add VpnTest back to presubmut" into main 2023-08-08 08:39:21 +00:00
chiachangwang
1a72396be6 Add VpnTest back to presubmut
These tests were disabled from presubmit because of flaky test.
It's no longer flaky now, so add these tests back to presubmit.

Bug: 293233390
Test: atest FrameworksNetTests
Change-Id: I7f1f36385d2ca6ed210e1d9b7399b6509fd26519
2023-08-07 08:47:34 +00:00
Treehugger Robot
860f2ac069 Merge "Fix flake : testVpnSetUnderlyingNetworks" into main am: 8ba50ae30f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2694348

Change-Id: I13f829b3c6ea3fba196802e6d58b7d4d9503f0e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-07 05:46:08 +00:00
Treehugger Robot
8ba50ae30f Merge "Fix flake : testVpnSetUnderlyingNetworks" into main 2023-08-07 05:22:20 +00:00
Chalard Jean
9033477aa7 Fix flake : testVpnSetUnderlyingNetworks
When the device is very slow to run this test, cell might end
its lingering period in the middle of the test while wifi is
the default. VPN will then ignore it as an underlying network,
causing the test to fail.

Test: testVpnSetUnderlyingNetworks
      Added sleep in a strategic place to make sure the problem
      was correctly identified, and observed the test failing.
      After the fix, the test passes with the sleep.
Fixes: 280627836
Fixes: 293844384
Change-Id: Iaf56de963eb17845c1d76a0310b55f7f9321f7e4
2023-08-07 14:20:13 +09:00
Yuyang Huang
592355ea69 Replace usage of android.util.Log to SharedLog am: 7ddf2935f9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2691568

Change-Id: Id3feaf4815e854303d9f65e9e46919a7ebe10dd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-07 05:02:14 +00:00
Yuyang Huang
7ddf2935f9 Replace usage of android.util.Log to SharedLog
Bug: 294326360
Test: atest FrameworksNetTests
Change-Id: I9a3a84f907362260bdcf6be19e2c4d5345788d2e
2023-08-06 17:34:50 +09:00
Kefan Tu
87e94fb070 Merge "Disable data saver mode in AbstractRestrictBackgroundNetworkTestCase setup" into main am: e30a605361
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2694717

Change-Id: I0e5991b30d100ef5beae811b913ddcfbe02a25fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-05 01:34:18 +00:00
Kefan Tu
f17e3349ba Disable data saver mode in AbstractRestrictBackgroundNetworkTestCase setup
This test assumes the data saver mode is initially disabled, but WearOS enables the mode on boot. This change fixes the precondition in the setUp method.

Test: run cts -m CtsHostsideNetworkTests
Bug: 280542664
(cherry picked from https://android-review.googlesource.com/q/commit:2cdeffc7e97a915a847cfc40d89e091aeadf20b3)
Merged-In: Ibcceaf0f44821100c861ef7b3c61d0888ae30481
Change-Id: Ibcceaf0f44821100c861ef7b3c61d0888ae30481
2023-08-04 22:02:25 +00:00
Yuyang Huang
32a0142d7f Add callbacks for service offload am: 33fa4d268c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2435053

Change-Id: I5ec211a4ebeeaa6fa03f5bbc4aaa356b9fed230f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 16:09:06 +00:00
Yuyang Huang
33fa4d268c Add callbacks for service offload
Components that can provide offload like IpClient (packet
filter offloading) can use the API to register a callback to be notified
when offload is necessary.

Bug: 269240366
Test: atest CtsNetTestCases
Change-Id: I8080702f5b530001b88e79e504f4722ac01bc576
2023-08-04 19:22:15 +09:00