Commit Graph

10985 Commits

Author SHA1 Message Date
Treehugger Robot
23d16ab877 Merge "Use "don't actively prefer" timeout when avoiding bad wifi" am: 7be7f06fc4 am: 2888d86635 am: adf2ce7657
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2588507

Change-Id: Idaf8ff19da225f5ecb5f047c4a93f88e9c570c28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 09:06:58 +00:00
Treehugger Robot
8a9f1ea6b2 Merge "Skip all of NetworkAgentTest in instant mode." am: ae6302156d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2599967

Change-Id: I551d3efa4a35c3d21510c783384561849855e2da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 09:06:47 +00:00
Lorenzo Colitti
ebfc3f62d8 Skip all of NetworkAgentTest in instant mode.
Recently, new test methods were added to NetworkAgentTest which
fail in instant mode because they are not marked @AppModeFull.

Because instant apps can't use NetworkAgent (it's a system API,
and it needs the NETWORK_FACTORY permission which is signature
only), just mark the whole test @AppModeFull so this cannot
happen again.

Bug: 283897713
Test: test is skipped in instant mode
(cherry picked from https://android-review.googlesource.com/q/commit:f1a61ad83de462dcd149ca53f0d417486ca1aec0)
Merged-In: Ib6ff07d9fdc329d3421a077532b8a434323053f8
Change-Id: Ib6ff07d9fdc329d3421a077532b8a434323053f8
Skip all of NetworkAgentTest in instant mode.

Recently, new test methods were added to NetworkAgentTest which
fail in instant mode because they are not marked @AppModeFull.

Because instant apps can't use NetworkAgent (it's a system API,
and it needs the NETWORK_FACTORY permission which is signature
only), just mark the whole test @AppModeFull so this cannot
happen again.

Fix: 283897713
Test: test is skipped in instant mode
Change-Id: Ib6ff07d9fdc329d3421a077532b8a434323053f8
2023-05-23 08:30:51 +00:00
Treehugger Robot
ae6302156d Merge "Skip all of NetworkAgentTest in instant mode." 2023-05-23 08:18:45 +00:00
Treehugger Robot
2c1b75ed15 Merge "Use "don't actively prefer" timeout when avoiding bad wifi" am: 7be7f06fc4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2588507

Change-Id: I99cf3621405e55b4e786b7c7b2e5671e46367c12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 07:22:27 +00:00
Lorenzo Colitti
f1a61ad83d Skip all of NetworkAgentTest in instant mode.
Recently, new test methods were added to NetworkAgentTest which
fail in instant mode because they are not marked @AppModeFull.

Because instant apps can't use NetworkAgent (it's a system API,
and it needs the NETWORK_FACTORY permission which is signature
only), just mark the whole test @AppModeFull so this cannot
happen again.

Bug: 283897713
Test: test is skipped in instant mode
Change-Id: Ib6ff07d9fdc329d3421a077532b8a434323053f8
2023-05-23 16:01:42 +09:00
Treehugger Robot
7be7f06fc4 Merge "Use "don't actively prefer" timeout when avoiding bad wifi" 2023-05-23 06:47:18 +00:00
Remi NGUYEN VAN
8a6c68720c Merge "Add test for subtype discovery/advertising" am: bf7a24833f am: f976c49ad7 am: 9a8567e48c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2586608

Change-Id: I946fb435399b0a6c761193aa083242d9ebe66cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 04:54:50 +00:00
Chalard Jean
6f6c353baf Use "don't actively prefer" timeout when avoiding bad wifi
Test: ConnectivityServiceTest
Change-Id: I6e99aff77c55805630d878e472f466bd31bba360
2023-05-23 13:47:15 +09:00
Remi NGUYEN VAN
53fe19ed34 Merge "Add test for subtype discovery/advertising" am: bf7a24833f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2586608

Change-Id: If22d982c8e2fe96bda0b54af43b8712482abb1d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 03:29:30 +00:00
Remi NGUYEN VAN
bf7a24833f Merge "Add test for subtype discovery/advertising" 2023-05-23 02:36:07 +00:00
Maciej Żenczykowski
a982c9fef6 Merge "deflake android.net.cts.NetworkStatsManagerTest#testUidTagStateDetails" am: bc37a4b004 am: 95caec515d am: ce346cfe19
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2598012

Change-Id: I7216b219d6d318a1d0dcbf73778958d9a5289dc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 19:45:25 +00:00
Maciej Żenczykowski
a246d97a26 Merge "deflake android.net.cts.NetworkStatsManagerTest#testUidTagStateDetails" am: bc37a4b004
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2598012

Change-Id: I2fd2e36e5e73f31c35ddfadbf1b346ae448a6c85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 18:18:39 +00:00
Maciej Żenczykowski
bc37a4b004 Merge "deflake android.net.cts.NetworkStatsManagerTest#testUidTagStateDetails" 2023-05-22 17:46:26 +00:00
Maciej Żenczykowski
b41a94db3c deflake android.net.cts.NetworkStatsManagerTest#testUidTagStateDetails
Observed failure in manual run on aosp/master cuttlefish:

[759/913] android.net.cts.NetworkStatsManagerTest#testUidTagStateDetails: FAILED (710ms)

STACKTRACE:
java.lang.AssertionError: QueryResult(tag=TAG_NONE state=STATE_FOREGROUND total=256756): 256756 not within 10% of 231272
        at org.junit.Assert.fail(Assert.java:89)
        at org.junit.Assert.assertTrue(Assert.java:42)
        at android.net.cts.NetworkStatsManagerTest.assertWithinPercentage(NetworkStatsManagerTest.java:743)
        at android.net.cts.NetworkStatsManagerTest.testUidTagStateDetails(NetworkStatsManagerTest.java:802)

256756 / 231272 =~= 1.11019  -->  just over 11% deviation.

Test: TreeHugger
Bug: 283166618
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ie9af706e4f84065050188b1c9b697cccd8509c32
2023-05-22 17:46:19 +00:00
Treehugger Robot
1998875b38 Merge "Delete the LinkAddress in cache when RTM_DELADDR is received" am: c27b04314d am: 61cca7c8e8 am: 118e97dd10
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2588506

Change-Id: I201fb32c038fb525d24956364c4ce1b9288de8e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 11:31:54 +00:00
Treehugger Robot
4e152a1599 Merge "Delete the LinkAddress in cache when RTM_DELADDR is received" am: c27b04314d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2588506

Change-Id: I1301aef385b96f7c1c3bd37dde99f3a45804a57c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-22 11:04:10 +00:00
Yuyang Huang
9d778c7fe7 Delete the LinkAddress in cache when RTM_DELADDR is received
The addOrUpdateInterfaceAddress() should be called when RTM_NEWADDR
message is received and the address isPreferred. The
deleteInterfaceAddress() should be called when RTM_DELADDR is called.

Bug: 282592527
Test: atest MdnsSocketProviderTest
Change-Id: I06a5940f53d01552f117309b1cc09256a2a9fae7
2023-05-22 17:17:27 +09:00
Remi NGUYEN VAN
eae8529fc6 Add test for subtype discovery/advertising
Check that advertised subtypes can be found by matching discoveries and
discoveries for the base type, and that discoveries for different
subtypes do not find the service.

Bug: 266167702
Test: atest
Change-Id: I0a8249cca22c1d30baad12bb4e8351a65ce87cb1
2023-05-22 15:26:40 +09:00
Remi NGUYEN VAN
404c1bf787 Use the ServiceTypeClient network for queries
Instead of the network specified in the MdnsSearchOptions, which is
often null to request searching on all networks, use the
MdnsServiceTypeClient Network to build the queries.

When MdnsSearchOptions.network is null, one MdnsServiceTypeClient is
created for each mDNS-compatible Network. Each MdnsServiceTypeClient
schedules queries with a Network selector. If the Network selector is
null, each MdnsServiceTypeClient will post its queries to all networks.
Instead, it should be the Network of the MdnsServiceTypeClient.

There is one remaining problem when a tethered interface is up: in that
case, there will be one MdnsServiceTypeClient for tethered interfaces
with a null network, which will still broadcast its queries to all
networks. This should be addressed in a follow-up by having
MdnsMultinetworkSocketClient only send queries to interfaces that have a
null network, when the network selector is null (and not all
interfaces).

Bug: 283708537
Test: atest
Change-Id: If571d7a59c5e55d809eeb1f3d1c4b58684612cdd
2023-05-22 14:49:59 +09:00
Motomu Utsumi
a88973900f Merge "Revert ConnectivityServiceDependencies access modifier" am: 404636629a am: e56665086b am: 89ee5eb187
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2593905

Change-Id: I21e315a603d8b733c33f2e58e4b438772b23a59b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 08:46:52 +00:00
Motomu Utsumi
73f98c23f4 Merge "Revert ConnectivityServiceDependencies access modifier" am: 404636629a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2593905

Change-Id: I426773edb80713a978fc81a0c1cbba2556b99d9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 07:20:15 +00:00
Motomu Utsumi
404636629a Merge "Revert ConnectivityServiceDependencies access modifier" 2023-05-18 05:54:32 +00:00
Motomu Utsumi
d54120344d Revert ConnectivityServiceDependencies access modifier
Address review comment on aosp/2490881

ConnectivityServiceDependencies was made public in aosp/2490881 to
verify destroyLiveTcpSockets call.
This CL reverts that change and updates tests to use mocked
DestroySocketsWrapper to verify destroy sockets call.

Bug: 270298713
Test: atest FrameworksNetTests
Change-Id: I101016399ea29bc5176b7559edf0447f0f7901ce
2023-05-18 12:31:44 +09:00
Lorenzo Colitti
66e3ede2ee Merge changes from topic "cherrypicker-L76200000960680946:N26500001369291245" into udc-dev
* changes:
  Stop MdnsServiceTypeClient send on socket destroy
  Do not send socket destroyed on unregistration
2023-05-17 08:04:18 +00:00
Chiachang Wang
93ef9b7875 Merge "Stop verifying wifi disconnect on T+ devices" into udc-dev 2023-05-17 06:35:16 +00:00
Motomu Utsumi
8a32db5fbc Merge changes from topic "cherrypicker-L68400000960711014:N74200001369704906" into udc-dev
* changes:
  Fix agents disconnecting in SUSPENDED state.
  Check clatd does not stop when suspended network is disconnected
2023-05-17 06:19:24 +00:00
Treehugger Robot
432a18b7e8 Merge "Immediately create native networks when NetworkAgents register." into udc-dev 2023-05-17 04:39:20 +00:00
chiachangwang
c5c8838270 Stop verifying wifi disconnect on T+ devices
Wifi remembers the wifi enabled state under airplane mode in the
Settings.Secure.WIFI_APM_STATE setting for the airplane mode
enhancement. Wifi will not be disconnected if user enables
the wifi under airplane mode. This behavior breaks the
assumption in testSetAirplaneMode. The test expects to always
receive the WiFi network disconnect after turning airplane
mode on.

The wifi enhancement was done with hidden method which should not
be referred in the cts. The intention of testSetAirplaneMode was
to verify the permission required for setting ariplane mode.
This change should be no harm for original intention.

Bug: 282436851
Test: atest CtsNetTestCases
(cherry picked from https://android-review.googlesource.com/q/commit:c346fc8a0d8330aa7cf033a8554233a90e683164)
Merged-In: I3458679378f0c12c26051f3dac7fcf155c1f469c
Change-Id: I3458679378f0c12c26051f3dac7fcf155c1f469c
2023-05-17 04:14:40 +00:00
Treehugger Robot
b636295e40 Merge "Update FrameworksNetTestsLib dependencies on VPN" am: c6522a0307 am: e278d07bea am: 87cff5364b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2591306

Change-Id: I031b924acdbc6f6ebf00514ca7037655b5317724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 03:52:52 +00:00
Motomu Utsumi
dfa632c82a Merge "Fix agents disconnecting in SUSPENDED state." am: ec4511c8aa am: e3b728f350 am: 2f427efa76
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2583410

Change-Id: I19069133f3fc54c652cc41cc2a3a9b5ffdf0afc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 03:52:31 +00:00
Motomu Utsumi
2f427efa76 Merge "Fix agents disconnecting in SUSPENDED state." am: ec4511c8aa am: e3b728f350
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2583410

Change-Id: I9af01a54a5595378d06733ece702c0fcdf30581a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 03:09:19 +00:00
Treehugger Robot
633696c59e Merge "Update FrameworksNetTestsLib dependencies on VPN" am: c6522a0307
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2591306

Change-Id: I7ef681a1eb30c1c90797c06f1b71e7ed2ad6080b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 03:09:01 +00:00
Treehugger Robot
c6522a0307 Merge "Update FrameworksNetTestsLib dependencies on VPN" 2023-05-17 03:04:20 +00:00
Remi NGUYEN VAN
05c7676acd Merge "Update ConnectivityCheckTargetPreparer references" 2023-05-17 02:55:56 +00:00
Remi NGUYEN VAN
43d33ee760 Update FrameworksNetTestsLib dependencies on VPN
In change ID: Ia2279bd1023296e3c949fa05bd74e921bf17da79,
ConnectivityServiceTest dependencies on VpnManagerService were removed,
adding a more limited dependency on LockdownVpnTracker instead. This
updates the "keep" rules for services.core-vpn to reflect that.

services.core-vpn is a subset of services.core that only includes the
classes in the "keep" rules, and their dependencies. This is because
ConnectivityServiceTests still depends on internal VPN classes, but
other usage of hidden API should not be added to the tests.

Using VpnManagerService causes problems for calculating coverage, as it
has indirect dependencies on many classes that end up included in the
test and show as uncovered in the dashboards including
NetworkPolicyManagerService.

The dependency on NPMS was found by looking at coverage reports and
unzipping services.core-vpn.jar. The fact that it is included due to
indirect dependencies from VpnManagerService was discovered by running a
dependency analysis tool (https://depfind.sourceforge.io/) on
services.core-vpn.jar in the out/ directory, with:

$ bin/DependencyExtractor services.core-vpn.jar > /tmp/graph.xml
$ bin/c2c /tmp/graph.xml -show-inbounds > /tmp/inbounds.txt

And running a script on the /tmp/inbounds.txt graph to find the path
from VpnManagerService to NPMS.

Bug: 259632671
Test: m
Change-Id: Idc6c9e6e998dbf968fd97582f904cb7aed56b5b5
2023-05-17 11:52:38 +09:00
wangshengrjxtjcb
9b5334dbad Fix agents disconnecting in SUSPENDED state.
Network state is not changed to disconnected when a networkagent
is disconnected and network state is SUSPENDED.

So the function requiresClat return true. Clat is not stoped.

Bug: 277682237
Test: atest FrameworksNetTests
(cherry picked from https://android-review.googlesource.com/q/commit:fd5d3d90e1da7411104902ddfe859ebd0e4a02fb)
Merged-In: I5edfcf64aca5d2d34325d722dd29fab41bcf2600
Change-Id: I5edfcf64aca5d2d34325d722dd29fab41bcf2600
2023-05-17 02:42:14 +00:00
Motomu Utsumi
f8d29e401e Check clatd does not stop when suspended network is disconnected
Currently, clatd is not stopped when suspended network is disconnected
and aosp/2583410 fixes this issue.
This CL adds test for current behavior, aosp/2583410 can update
testDisconnectSuspendedNetworkStopClatd to call verifyClatdStop instead
of verifyNeverClatdStop

Test: atest FrameworksNetTests
Bug: 277682237
(cherry picked from https://android-review.googlesource.com/q/commit:4a5b06559fc276a06f53134694a0a6548b36b026)
Merged-In: I345e097ce8e114800d77c5f44d38d7ae4938935c
Change-Id: I345e097ce8e114800d77c5f44d38d7ae4938935c
2023-05-17 02:42:07 +00:00
Motomu Utsumi
4026eca58f Merge "Fix agents disconnecting in SUSPENDED state." am: ec4511c8aa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2583410

Change-Id: I0a4c0c474c3e43237fb6100aa931b7f09fc49b7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 02:05:45 +00:00
Motomu Utsumi
ec4511c8aa Merge "Fix agents disconnecting in SUSPENDED state." 2023-05-17 01:59:18 +00:00
Treehugger Robot
0de1e8a560 Merge "ConnectivityDiagnosticsManagerTest: Raise timeout to 10s" am: e22bffecda am: 83e60b9db8 am: 5e99c3a16e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2592365

Change-Id: I1c18fe2210539212ed5790cfb9a571e19e64eaf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 21:49:54 +00:00
Patrick Rohr
6da99475a3 IpSecManagerTest: clean up assertion for better error reporting am: a1e4289eeb am: f1244c5f61 am: c6056a7937
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2592285

Change-Id: Icdc386f2af030fd1af904d8f53c6c5b879769940
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 21:49:36 +00:00
Treehugger Robot
5e99c3a16e Merge "ConnectivityDiagnosticsManagerTest: Raise timeout to 10s" am: e22bffecda am: 83e60b9db8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2592365

Change-Id: Ic462a1a5621168f511ac2bad7a76977cf9c155c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 21:08:04 +00:00
Patrick Rohr
c6056a7937 IpSecManagerTest: clean up assertion for better error reporting am: a1e4289eeb am: f1244c5f61
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2592285

Change-Id: Ia065e14c5ac8d5d2ca048b21102ae7cb3c65656d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 21:05:00 +00:00
Treehugger Robot
9218bd290e Merge "ConnectivityDiagnosticsManagerTest: Raise timeout to 10s" am: e22bffecda
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2592365

Change-Id: I09ea85e99660f7bd0117b98a8e0c9d28eaaa9866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 20:09:23 +00:00
Patrick Rohr
a5a82a5844 IpSecManagerTest: clean up assertion for better error reporting am: a1e4289eeb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2592285

Change-Id: Iebdd3923d749fad1eb51870e9d13a0dd17edcf0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 20:09:10 +00:00
Treehugger Robot
e22bffecda Merge "ConnectivityDiagnosticsManagerTest: Raise timeout to 10s" 2023-05-16 19:17:58 +00:00
Patrick Rohr
94fd10fde5 ConnectivityDiagnosticsManagerTest: Raise timeout to 10s
In rare cases, ACTION_CARRIER_CONFIG_CHANGED arrives right around the 5s
mark at which the test times out.

Bug: 275217887
Test: TH
Change-Id: I737bd40f0cddf6cdea9a4c5afbb50e13aad74af2
2023-05-16 17:43:08 +00:00
Patrick Rohr
a1e4289eeb IpSecManagerTest: clean up assertion for better error reporting
See the following flaky failure:
https://android-build.corp.google.com/test_investigate/?invocationId=I59900010160325881&testResultId=TR98428662107002537

Bug: 270193575
Test: TH
Change-Id: I90dfbbec49d86fbf61d378f0ae98ddde5f27bf1f
2023-05-16 17:17:08 +00:00
Motomu Utsumi
02746f8b1c Merge "Check clatd does not stop when suspended network is disconnected" am: d15b397606 am: 3f8661db20 am: 52f35853cc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2588508

Change-Id: I0bc7ba248cccf913db9d53e49a801863d0543c73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 09:36:29 +00:00