Commit graph android_packages_modules_Co.../tests/unit/java/com/android/server
Message SHA1
Merge "Test that VPN lockdown restarts the VPN agent."
Jean Chalard   authored and   Gerrit Code Review   commited 2023-04-17 05:38:54 +00:00
2c930437e9
Merge "Add test for updating IKE about IP address changes"
Jean Chalard   authored and   Gerrit Code Review   commited 2023-04-17 05:36:35 +00:00
ca35653803
Merge "Adjust tests for delay in restarting/migrating IKE"
Jean Chalard   authored and   Gerrit Code Review   commited 2023-04-17 05:35:21 +00:00
6213d571a8
Merge "Separate events usage for starting socket keepalives"
Chiachang Wang   authored and   Gerrit Code Review   commited 2023-04-17 02:32:00 +00:00
2cf6b2c4fd
Merge "Fix inexact argument type warning"
Chiachang Wang   authored and   Gerrit Code Review   commited 2023-04-17 01:48:31 +00:00
baefd61455
Handle downstream tethering interface addresses in MdnsSocketProvider
MdnsSocketProvider currently does not fill addresses of downstream
tethering interfaces in its callbacks. The interface addresses should be
properly updated by listening to the Netlink messages.

Test: atest FrameworksNetTests CtsNetTestCases
Bug: 267980538
Change-Id: I753e547a1b092703fe59c6c9e922ee8aca245f67

Yuyang Huang   commited 2023-04-15 21:55:51 +09:00
700778be70
Separate events usage for starting socket keepalives
This is a clean up commit to correct the javadoc of
NetworkAgent.CMD_START_SOCKET_KEEPALIVE. This event was used
between ConnectivityService/NetworkAgent, and also
ConnectivityService/KeepaliveTracker with different semantics.
This may confuse the developers to update the doc incorrectly,
so also separate the usage to different events.

Also move the event definitions together so that a new event
definition will not mis-use the existing values.

Test: atest FrameworksNetTests
Change-Id: I73ebd8abcc610531da3057da2d643a41befb2099

chiachangwang   commited 2023-04-14 07:43:56 +00:00
f1b1fb4b7f
Test that VPN lockdown restarts the VPN agent.
Bug: 246162564
Test: atest FrameworksNetTests:VpnTest
Change-Id: I35f08bf263cec19bbfb1d656d1d89dbb0acf8944

Chalard Jean   commited 2023-04-14 16:38:19 +09:00
23197121a1
Add test for updating IKE about IP address changes
Bug: 269715746
Test: VpnTest
Change-Id: I2c3a7f0f0af193b5497beaff38d54a80020a7aa0

Chalard Jean   commited 2023-04-14 12:22:46 +09:00
2b9bcb7830
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

Chalard Jean   commited 2023-04-14 12:22:46 +09:00
9d85c7aa4c
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

chiachangwang   commited 2023-04-14 01:58:18 +00:00
25c74bd250
Merge "Include/exclude mDNS interfaces based on transport"
Treehugger Robot   authored and   Gerrit Code Review   commited 2023-04-12 05:28:02 +00:00
5864b59462
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

Remi NGUYEN VAN   authored and   Yuyang Huang   commited 2023-04-12 12:43:00 +09:00
145b16cb5a
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

Maciej Å»enczykowski   commited 2023-04-11 19:24:28 +00:00
b548e191de
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

Yuyang Huang   commited 2023-04-05 13:06:13 +09:00
3bee9d4099
Merge "Request cell in #testExplicitlySelected"
Treehugger Robot   authored and   Gerrit Code Review   commited 2023-03-28 07:57:33 +00:00
dafaf2a08b
Merge "Adjust polling interval for auto on/off keepalives"
Chiachang Wang   authored and   Gerrit Code Review   commited 2023-03-27 06:05:08 +00:00
0342985117
Adjust polling interval for auto on/off keepalives
The system polls TCP connections every 2 minutes for the auto
on/off keepalives. For some carriers, the NAT-T keepalive delay
is lower than this, which means it's possible a TCP connection
is opened seconds after the poll. This may cause connections
being disconnected because keepalive timed-out.

The minimal acceptable value should be the same as the keepalive
delay. But the system may take time to restart keepalive. Adjust
the delay of the polling alarm to be lower than the keepalive
delay to preserve some time for the system to restart the
keepalive.

Bug: 273411114
Test: atest FrameworksNetTests
Change-Id: I28f71ceb7b72d83e6e0f8f7d22d3d1e9dbdaa467

chiachangwang   commited 2023-03-25 09:15:08 +00:00
d953d0182a
Merge "Verify the update of shouldLongLivedTcpExcluded in VpnTransportInfo"
Chiachang Wang   authored and   Gerrit Code Review   commited 2023-03-25 04:12:22 +00:00
ce1bc54e66
Merge "Clean up the LinkProperties when stop monitoring sockets"
Paul Hu   authored and   Gerrit Code Review   commited 2023-03-21 01:30:05 +00:00
46eb5f4b5e
Clean up the LinkProperties when stop monitoring sockets
The active network LinkProperties are not cleaned up after stop
socket monitoring. Then the apps will have duplicate sockets
to discover on one interface if the interface has been toggled,
because requestSocket will return both the old socket (for the
old netId that is actually gone) and a new socket on the same
interface, for the new netId. Thus, clean up the LinkProperties
when stop monitoring sockets.

Bug: 274063187
Test: atest FrameworksNetTests android.net.cts.NsdManagerTest
Change-Id: I3d600169b069a1534bd740e711bc21db107b1201

Paul Hu   commited 2023-03-20 15:06:05 +08:00
13921b2cdc
Merge changes from topics "nonAutoIPSelection", "preferredIpProtocol"
* changes:
  Test IP version and encap type set in non-auto IP selection mode
  Test reading preferred IP protocol from carrierconfig

Chiachang Wang   authored and   Gerrit Code Review   commited 2023-03-20 02:39:42 +00:00
f6682143ac
Merge "Add a CompatChange flag to enable platform backend"
Paul Hu   authored and   Gerrit Code Review   commited 2023-03-17 13:14:19 +00:00
62503cfef1
Connectivity Tests: join handler thread after calling quitSafely
Somewhat surprisingly, HandlerThread#quitSafely is *not* a synchronous
method, so the tearDown() method still needs to wait for the thread to
join.

Test: TH
Change-Id: I0433e2100adf9299a67af5c259a518cf44f4be57

Patrick Rohr   commited 2023-03-17 01:01:09 -07:00
98021b650b
Merge "Factor out adding records to a generic"
Paul Hu   authored and   Gerrit Code Review   commited 2023-03-17 02:30:39 +00:00
a08f8867f8
Verify the update of shouldLongLivedTcpExcluded in VpnTransportInfo
Bug: 273422889
Test: atest FrameworksNetTests
Change-Id: I5e25d1b8b1f86dc4474cef1616cb16668119240a

chiachangwang   commited 2023-03-17 02:04:13 +00:00
052dbb85d3
Add a CompatChange flag to enable platform backend
Apps targeting sdk < U are considered to use a legacy native
daemon as NsdManager backend, but other apps use a
platform-integration mDNS implementation as backend. So add a
CompatChange flag to enable platform backend for non-legacy
apps.

Bug: 270306772
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I7ba58f8a5186fb49ad5f8aeacc8b8234bef1eabe

Paul Hu   commited 2023-03-17 09:10:46 +08:00
2e0a88c0fa
Request cell in #testExplicitlySelected
When the test is very slow (e.g. in coverage tests) it's
possible this test takes > 30 seconds and cell finishes
lingering before the end of the test. This will cause a
disconnection of cell before wifi and fail the test.

Address this by requesting cell.

Bug: 273383734
Test: atest --iterations 100 'FrameworksNetTests:android.net.connectivity.com.android.server.ConnectivityServiceTest#testExplicitlySelected'
Change-Id: I06a7ef82de966b522e58a969c25a4c0335dbc497

Chalard Jean   commited 2023-03-16 22:12:52 +09:00
7cf34ec1cd
Test IP version and encap type set in non-auto IP selection mode
Test: atest FrameworksNetTests
Change-Id: I8f4a54f7b35135806c940b5cee2c600f4454f2fb

chiachangwang   commited 2023-03-16 03:00:45 +00:00
e1aacc797c
IpConfigStoreTest: increase timeout for waitForIdle
waitForIdle in readIpConfigurationFromFilePath times out.

Test: TH
Change-Id: I5bc8c5b4678b984ec6406d85725297a63faeaabf

Patrick Rohr   commited 2023-03-15 19:48:25 +00:00
c641e019ef
Test reading preferred IP protocol from carrierconfig
Bug: 259000745
Test: atest FrameworksNetTests
Change-Id: Ie9f546ae60fcc2e21479e5d7cbc86c96cfbedc84

chiachangwang   commited 2023-03-15 05:20:22 +00:00
55dc7b6e9f
Merge changes from topics "kpFromCarrier", "noNetCapNoMigration"
* changes:
  Verify no migration started without valid network capabilties
  Test reading keepalive timer from carrierconfig

Chiachang Wang   authored and   Gerrit Code Review   commited 2023-03-09 12:17:21 +00:00
c211511b64
Verify no migration started without valid network capabilties
Bug: 269714970
Test: atest FrameworksNetTests
Change-Id: I0f1a8cbdcb0a8a102036388b39162dca775c3f5d

chiachangwang   commited 2023-03-09 09:02:40 +00:00
334b8dba3a
Test reading keepalive timer from carrierconfig
Bug: 259000745
Test: atest FrameworksNetTests
Change-Id: I2e750a7b090dd09553fae921163e19fc99a2d582

chiachangwang   commited 2023-03-09 09:01:17 +00:00
3a91e2d4f6
Merge "Remove unused augmentWithStackedInterfaces"
Treehugger Robot   authored and   Gerrit Code Review   commited 2023-03-09 06:55:24 +00:00
e9df7ca57f
Merge "Update system APIs based on feedback."
Jeff Sharkey   authored and   Gerrit Code Review   commited 2023-03-09 02:47:49 +00:00
31b6c65f51
Merge changes from topic "PerNetworkServiceTypeClient"
* changes:
  Create MdnsServiceTypeClient per network
  Wait for a socket to be created before sending packets

Paul Hu   authored and   Gerrit Code Review   commited 2023-03-08 11:14:57 +00:00
71c006bd14
Merge "Migrate reigster service callback backend"
Paul Hu   authored and   Gerrit Code Review   commited 2023-03-08 10:27:57 +00:00
ee0e6cd701
Remove unused augmentWithStackedInterfaces
after the commit aosp/1948496, both mMobileIfaces and mWifiIfaces
already contain the stacked interfaces. Hence, the method is not
really useful.

Test: TH
Fix: 215633405
Change-Id: Id132a166e9cf94cab711f417a4f7ffc84eab6185

Junyu Lai   commited 2023-03-08 13:49:00 +08:00
615610c3d1
Create MdnsServiceTypeClient per network
The running task in MdnsServiceTypeClient would be cancel if the
requests using other networks for the same service type start a
new discovery. Besides, the instanceNameToResponse cache would
be incorrect too. The service attributes may be different on
different networks, so there needs to be a different instance
of the cache. Thus, the MdnsServiceTypeClient needs to be
Network-specific.

Bug: 265787401
Test: atest FrameworksNetTests
Change-Id: Id5ac42f3522a774fe9789c0de4d5357501b63868

Paul Hu   commited 2023-03-08 10:01:50 +08:00
da3c0fe857
Wait for a socket to be created before sending packets
The required sockets may not have been created yet when
MdnsServiceTypeClient#startSendAndReceive is called on
MdnsDiscoveryManager#registerListener, so the first send would go
nowhere, and only later retries would be sent. Ideally the code
would wait for some sockets to be created before calling
startSendAndReceive.

Bug: 265787401
Bug: 264634275
Test: atest FrameworksNetTests
Change-Id: Id789d564d125c0192e742d7dd246367afdb93413

Paul Hu   commited 2023-03-07 19:21:24 +08:00
bf9d2a0ea0
Update system APIs based on feedback.
API council has requested that the recently added BroadcastOptions
APIs be modified to better match API guidelines.

Bug: 267646347
Test: treehugger
Change-Id: Ia701ae31079476d0cc05079d62cd90ba81279cdd

Jeff Sharkey   commited 2023-03-06 14:10:34 -07:00
4ffd34cc42
Merge "Keep case in MdnsServiceInfo attributes"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2023-03-06 13:03:46 +00:00
2172a5a370
Keep case in MdnsServiceInfo attributes
Although case should not matter when comparing attributes,
converting all keys to lowercase breaks NsdServiceInfo APIs which
provide the original case to the caller.

Use a TreeMap with a case-insensitive comparator to ignore case when
querying keys, while keeping case information in the map.

Bug: 270885892
Test: atest MdnsServiceInfoTest
Change-Id: Id15947b1e8650eb6b59126c5d2dc8624ae4f8100

Remi NGUYEN VAN   commited 2023-03-06 19:52:53 +09:00
0e929ddfcd
Factor out adding records to a generic
- Make a method addOrReplaceRecord() that can support point,
  inet4Address and inet6Address records adding.
- Also fix some leftover comments in aosp/2431933

Bug: 268586836
Test: atest FrameworksNetTests
Change-Id: I01462a967a04e88f14dcbb92ca207deb4268612c

Paul Hu   commited 2023-03-06 15:13:00 +08:00
ab4b7d886c
Fill in all resolved addresses into NsdServiceInfo
Now, the multiple addresses is supported in resolution service
with the new java backend. Thus, fill in all resolved addresses
into NsdServiceInfo.

Bug: 268586836
Test: atest FrameworksNetTests
Change-Id: I499a749255429df9fe9fbad678074ad383159240

Paul Hu   commited 2023-03-06 14:27:53 +08:00
2b86591d39
Migrate reigster service callback backend
registerServiceInfoCallback currently only sends updates for
addresses added, but does not handle removes (expiration) and
TXT/SRV record updates. Thus, migrate its backend to
MdnsDiscoveryManager which can support the expiration update.

Bug: 266030646
Test: atest FrameworksNetTests CteNetTestCases
Change-Id: I72add213935dc1beacb6277007868ad30bd89c00

Paul Hu   commited 2023-03-06 13:49:19 +08:00
30bd70d168
Merge "Support multiple IPv4 / IPv6 addresses in MdnsResponse"
Paul Hu   authored and   Gerrit Code Review   commited 2023-03-06 03:47:09 +00:00
6477d7b697
Support multiple IPv4 / IPv6 addresses in MdnsResponse
If the mDNS service has multiple IPv4 / IPv6 addresses, only the
last added address will be present on the response. Since the
NsdServiceInfo supports multiple host addresses in Android U, the
MdnsResponse should also support multiple IPv4 / IPv6 addresses
in favor of providing accurate service info to clients.

Check cache flush flag on the response when adding a new address
record. Per RFC6762 10.2, clear all address records if the
cache-flush bit set.

Bug: 268586836
Test: atest FrameworksNetTests
Change-Id: I04548a3f16837939f3131b84c1033377ff81d521

Paul Hu   commited 2023-03-03 21:40:47 +08:00
3a632aeb6b
Merge changes I987ab866,I73fa9ca7
* changes:
  Drop dot at the end of service type
  Implement the stop resolution with MdnsDiscoveryManager

Paul Hu   authored and   Gerrit Code Review   commited 2023-03-03 12:56:38 +00:00
e4407fb469