Commit graph android_packages_modules_Co.../tests/unit/java
Message SHA1
Merge "Update the imports to androidx.test.filters.*" into main
Ram Peri   authored and   Gerrit Code Review   commited 2024-03-01 16:38:04 +00:00
64a8fa9d13
Merge "Move VpnManagerServiceTest and VpnTest to frameworks" into main
Chiachang Wang   authored and   Gerrit Code Review   commited 2024-03-01 00:58:31 +00:00
0df28d82be
Merge changes from topic "mdns-ttl" into main
* changes:
  [mdns] add service-side impl for NSD service TTL support
  [mdns] add API for setting/getting TTL value

Treehugger Robot   authored and   Gerrit Code Review   commited 2024-02-29 21:00:27 +00:00
0520e26936
Update the imports to androidx.test.filters.*
Bug: 316941721
Test: mmma .
Change-Id: I113714afaeb99bf76ff4dc19304371ad0ec097e0

Fangqiu Su   commited 2024-02-29 17:56:14 +00:00
61a14ca475
Move VpnManagerServiceTest and VpnTest to frameworks
These unit tests are closely tied to the source code in
frameworks/base and were incorrectly placed in the connectivity
module. Also update the libraries visibility that are used by
the tests.

Test: atest FrameworksNetTests
Change-Id: I196c33a8bd5b5cdb9d42aea381e900681ff6d25e

Chiachang Wang   commited 2024-02-29 07:48:02 +00:00
a5d9875823
Merge "De-duplicate questions with multiple listeners" into main
Treehugger Robot   authored and   Gerrit Code Review   commited 2024-02-28 15:45:55 +00:00
d4b802064b
[mdns] add service-side impl for NSD service TTL support
This is the service-side implementation of the custom service TTL
support added in aosp/2606573.

Bug: 284903641
Test: atest CtsNetTestCases FrameworksNetTests
Change-Id: I35246dae37b9fd1710b99cdda10068928e418457

Kangping Dong   commited 2024-02-28 21:42:37 +08:00
cd35018bc6
Merge "Fix flaky testSampleConnectivityState" into main
Motomu Utsumi   authored and   Gerrit Code Review   commited 2024-02-28 11:05:01 +00:00
2124217588
[mdns] add API for setting/getting TTL value
To support Thread Border Router use case, an Android device needs to act
as a mDNS service discovery (RFC 8766) & advertising proxy (
https://datatracker.ietf.org/doc/draft-ietf-dnssd-advertising-proxy).
This means it needs to advertise and discover DNS-SD services of custom
TTL value on behalf of other devices.

This commit fulfills this requirement by adding TTL getter/setter to
NsdServiceInfo. When registering a service, the specified TTL will be
used for corresponding resource records.

Bug: 284903641
Test: atest CtsNetTestCases FrameworksNetTests
Change-Id: I23837834847dc3a0fb452c5929a1b36e3fc1fb3f

Kangping Dong   commited 2024-02-28 15:53:51 +08:00
2ffe82dab5
Fix flaky testSampleConnectivityState
testSampleConnectivityState was flaky since sometimes networks were
disconnected before ConnectivityService#sampleConnectivityState
generates metrics
This CL fixes this issue by adding setKeepConnectedReason to prevent
networks are disconnected

Bug: 318546530
Test: TH
Change-Id: I824f5cd379c8144b48341cc0fd18eb976a4b1cde

Motomu Utsumi   commited 2024-02-28 12:18:57 +09:00
e7a9ef8c0f
Merge "SatelliteAccessController enhancements to handle Multiple User" into main
Nagendra Prasad Nagarle Basavaraju   authored and   Gerrit Code Review   commited 2024-02-26 16:44:08 +00:00
63ff28ed54
SatelliteAccessController enhancements to handle Multiple User
- onRoleHoldersChanged & onRoleSmsChanged handling for multiple Users
- Different satelliteNetworkFallbackUids cache for each user.
- Merging uid of each user cache and sending for Multi Layer request
- check SATELLITE_COMMUNICATION permission based package manager
  context at different UserHandle

Bug: 324347502
Test: atest FrameworksNetTests
Change-Id: If98524ec7846909d70db3e962e2a11c912768551

Nagendra Prasad Nagarle Basavaraju   commited 2024-02-26 11:24:01 +00:00
f63e6d8e67
Merge "Correct the method used for permission check" into main
Chiachang Wang   authored and   Gerrit Code Review   commited 2024-02-26 06:02:57 +00:00
c91b22be98
Merge "Add methods to support verifying captive portal launch" into main
Chiachang Wang   authored and   Gerrit Code Review   commited 2024-02-26 06:02:42 +00:00
3023965cf8
Correct the method used for permission check
The hasNetworkStackPermission() method does not enfore the
permission check. It should be replaced with
enforceNetworkStackPermission().

Bug: 325984919
Test: atest FrameworksNetTests
Change-Id: I9ad0b47190dbc9afd2ee6f5dfc21a4935036733a

Chiachang Wang   commited 2024-02-26 03:08:22 +00:00
ac162f2272
Add methods to support verifying captive portal launch
Test: atest FrameworksNetTests
Bug: 325984919
Change-Id: If76a216eca8527b4a7a7f7776d09f66e62daea06

Chiachang Wang   commited 2024-02-26 03:08:22 +00:00
82b6839c02
Merge "Support TrafficStatsRateLimitCache" into main
Junyu Lai   authored and   Gerrit Code Review   commited 2024-02-23 07:36:51 +00:00
52f6a8a28e
Add start activity method override method
Add helper methods to support verifying startActivityAsUser().

Test: atest FrameworksNetTests
Bug: 325984919
Change-Id: Id512ba6b1181974dde799ece64b263ce7a2f88f7

Chiachang Wang   commited 2024-02-22 02:35:44 +00:00
6b95876228
Add permission control methods override
Bug: 325984919
Test: atest FrameworksNetTests
Change-Id: Ib57a4a936538295a6df10ae7e334bc969ea455d1

Chiachang Wang   commited 2024-02-22 01:36:39 +00:00
692727b84e
Support TrafficStatsRateLimitCache
This is used in follow-up changes to rate-limit TrafficStats
get* API calls.

Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.net.TrafficStatsRateLimitCacheTest
Bug: N/A
Change-Id: I91bc71dda3a1b7c0b5525278b3c04d12492972fa

Junyu Lai   commited 2024-02-21 17:42:37 +08:00
b5ee82177b
De-duplicate questions with multiple listeners
When multiple listeners are registered for a resolve query, they were
duplicated in servicesToResolve, so the A/AAAA/PTR/SRV queries would
appear multiple times in the question section of query packets.

Ensure that makeResponsesForResolve does not generate duplicate
responses for duplicate listeners to avoid the duplicate queries.

Bug: 288174267
Fixes: 285090822
Test: atest
Change-Id: Ie6f76de6bfc5018c4c479505f99fbe6d81b64434

Remi NGUYEN VAN   authored and   Paul Hu   commited 2024-02-21 03:41:05 +00:00
afab821347
Store the SubscriptionId together with the Carrier UID
Always store the corresponding SubscriptionId together with the Carrier
uid so that when the carrier loses the Privilege, both the uid and
SubscriptionID will be used in the onCarrierPrivilegesLost callback

Bug: 324357121
Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.connectivity.CarrierPrivilegeAuthenticatorTest
      atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.ConnectivityServiceTest
Change-Id: I28e51c583261a67d4441c6f825ade6781b862ee4

Ying Xu   commited 2024-02-20 08:58:31 -08:00
0d06b9460a
Merge "Raise the max listener per client limit to 200" into main
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2024-02-13 06:01:47 +00:00
13a0cc04f6
Raise the max listener per client limit to 200
Raise the max listener per client limit from 10 to 200.

A frequent use-case for NsdManager is to file a DiscoveryListener,
and try to resolve/listen for every service using a ServiceInfoCallback.

The current limit of 10 callbacks is easy to hit in that case, since it
would happen if there are at least 10 devices on the network.

Raise the limit to 200 to avoid such problems. In practice it is very
unlikely that there would be more than 200 services on a network; if
advertised by different devices, they would barely fit in a /24 IPv4
prefix, so a limit of 200 should generally be high enough.

Note that for discovery 200 listeners does not mean that batches of 200
queries will be sent: listeners on the same service type are grouped
together so only one query is sent for the type, and results are
distributed to matching listeners.

Note also that the limit is currently only checked when registering
discovery or advertising requests. This should be also checked when
registering other kinds of listeners in a future change.

Bug: 324377460
Test: atest
Change-Id: I86fc00777e9dea3e5192b575581ba562e7401e42

Remi NGUYEN VAN   commited 2024-02-13 11:41:58 +09:00
12a0c6a17d
Update CSTest to start thread from setup to avoid thread leak
Starting thread from constructor could cause thread leak when assumption
fails and teardown is not called.
This CL moves initialization that starts thread to the setup.

Test: TH
Bug: 322659435
Change-Id: I8e84c12600a98d8019b7759103032c7d668cecd1

Motomu Utsumi   commited 2024-02-08 16:53:31 +09:00
f6045b43d9
Support Satellite Network Preferred uid's multi layer request
- Implement handleSetSatelliteNetworkPreference() at ConnectivityService
  to create multi layer request with preference order
  PREFERENCE_ORDER_SATELLITE_FALLBACK.
- unit test coverage

Bug: 320514105
Test: m and atest FrameworksNetTests
Change-Id: I3f71104f8c3c998599eaab71ae4076985f4bed77

Nagendra Prasad Nagarle Basavaraju   commited 2024-02-07 16:16:42 +00:00
804aa2326d
Add SatelliteAccessController class to support messaging on Satellite Internet
- create SatelliteAccessController class to identify role sms and
  satellite communication enabled uid's, to keep track of role changes
  through OnRoleHoldersChangedListener and to request to create
  multi layer request to ConnectivityService.
- unit test coverage

Bug: 320514105
Test: m and atest FrameworksNetTests
Change-Id: I95086f7a4fd6fe1261f432e605d792204ff5310b

Nagendra Prasad Nagarle Basavaraju   commited 2024-02-07 16:10:20 +00:00
33c7da3661
add TRANSPORT_SATELLITE to NetworkCapabilities
This commit also updates to use V14 dnsresolver APIs which was V13.

Bug: 320514105
Test: m & atest FrameworksNetTests
Change-Id: I6e92f4d99e0eba3b5d1d5e45bf11e5e945ea43f1

Nagendra Prasad Nagarle Basavaraju   commited 2024-02-07 16:07:39 +00:00
1fa6f09019
Support bringing up restricted wifi
This CL allows the Carrier Config app to request restricted WiFi nework
by setting the correspoding subscription ID in the network request.

Bug: 315835605
Test: atest android.net.cts.NetworkRequestTest
      atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.connectivity.CarrierPrivilegeAuthenticatorTest
      atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.ConnectivityServiceTest

Change-Id: I237e692d092ff5f969ce4b7962f6d58099a6f3a9

Ying Xu   commited 2024-02-07 04:24:38 -08:00
7cabd32bc5
Merge "Rename check*Permission* to has*Permission" into main
Junyu Lai   authored and   Gerrit Code Review   commited 2024-02-02 07:07:31 +00:00
ef58a8a33a
Merge "Increase max metrics duration deviation to 2 hours" into main
Hansen Kurli   authored and   Gerrit Code Review   commited 2024-02-02 05:29:54 +00:00
84cc4e507e
Merge "Fix querying of multiple subtypes" into main
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2024-02-01 07:25:40 +00:00
742588457a
Rename check*Permission* to has*Permission
The check*Permission methods are a bit error-prone because people
can forget to check the return value and expect that they behave
like the enforce* methods. This was pointed out before in some bugs.

This change adds @CheckResult annotation to enforce linter warning
and rename methods accordingly.

Test: TH
Fix: 279691948
Change-Id: Ibb0df6540fe0ed40289bb190b790130daaa2f763

Junyu Lai   commited 2024-02-01 15:24:35 +08:00
71b5153898
Increase max metrics duration deviation to 2 hours
A lot of WTF logs reported were barely 1 second over the 1 hour
limit. AlarmManager has a maximum window of 1 hour so these cases
are possible and expected.
Increase the max metrics duration deviation to 2 hours to avoid
this log.

Bug: 297292877
Test: Manual test
Change-Id: I9a476e8061944c6499fe1b1d6e9ad1e19e6ce2b9

Hansen Kurli   commited 2024-01-31 20:09:27 +08:00
d85482534c
Fix querying of multiple subtypes
Previously only the subtypes of the last registered listener would be
included in the discovery queries.

This fixes that by combining the subtypes of all registered listeners,
to be included in the queries. By moving the queried subtypes from the
QueryTaskConfig to the QueryTask, they are now recalculated before each
send (like the existing servicesToResolve), so are always in sync with
the registered listeners.

Fixes: 322918399
Test: atest
Change-Id: I9a4c94189f997e3a9f92e46b5eb1762e9925cf4c

Remi NGUYEN VAN   commited 2024-01-31 17:01:59 +09:00
2c607bd8cd
Simplify the burst time logic
Address the remaining comments in aosp/2874718 to simplify the
burst time logic.

Bug: 271067818
Test: atest FrameworksNetTests NsdManagerTest
Change-Id: I619f45189b10da3e09759ee1d57a898173a9fff8

Paul Hu   commited 2024-01-31 02:34:21 +00:00
2a6be8e30a
Merge "Fix service found callback on subtype update" into main
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2024-01-30 07:48:13 +00:00
57ead48b11
Merge "Add aggressive query mode" into main
Paul Hu   authored and   Gerrit Code Review   commited 2024-01-30 07:37:41 +00:00
b4fba147cd
Add aggressive query mode
The current query scan modes, active and passive, have
limitations. Unicast queries only originate from the first query
session, multicast queries should be sent simultaneously with
unicast, and both modes suffer from infrequent scans. To
address these shortcomings, a aggressive query mode is proposed.

Bug: 271067818
Test: atest FrameworksNetTests NsdManagerTest
Change-Id: I87100e03a5b6306dcae79f05c034f000e6dc2889

Paul Hu   commited 2024-01-30 03:34:11 +00:00
11a883dc92
Merge "NetworkUtilsTest.testSetSockOptBytes" into main
Yang Sun   authored and   Gerrit Code Review   commited 2024-01-30 01:43:05 +00:00
24563fa502
Fix service found callback on subtype update
If a service is found without a requested subtype, then updated to have
that subtype, onServiceUpdated would be sent instead of onServiceFound.

Fix this by tracking which services have been found by each listener, as
whether a service is newly found or updated depends on the options (in
this case the subtype filter) of each listener.

Fixes: 317167170
Test: atest
Change-Id: If8dbe04d858082a872c0f068433a3680331c670b

Remi NGUYEN VAN   commited 2024-01-29 18:48:56 +09:00
296e38e779
Merge changes from topic "nsd-custom-host" into main
* changes:
  [mdns] service-side impl for custom host
  [mdns] add API support for custom hostname

Handa Wang   authored and   Gerrit Code Review   commited 2024-01-29 08:36:56 +00:00
a90737dc23
Merge "Use an integer for query mode" into main
Paul Hu   authored and   Gerrit Code Review   commited 2024-01-29 08:08:58 +00:00
22827c3814
[mdns] service-side impl for custom host
This CL adds the service-side implementation of the custom host support
added in aosp/2890957.

Bug: 284904661
Bug: 320838284
Test: atest CtsNetTestCases FrameworksNetTests
Change-Id: I92c774ead4778870ff7358ccb28d6ad6e266f1b5

Handa Wang   commited 2024-01-29 06:46:43 +00:00
096e32e065
[mdns] add API support for custom hostname
This commit adds support of regsitering a service with a custom
hostname. This is required to enable Advertising Proxy feature for Thread
devices.

For example:
```
NsdServiceInfo info = new NsdServiceInfo();

info.setServiceName("My Service");
info.setServiceType("_test._tcp");
info.setHostname("MyHost");
info.setHostAddresses(List.of(address1, address2));

nsdManager.registerService(info, PROTOCOL_DNS_SD, listener);
```

This CL also adds two new error codes for service/host registration
conflict: `FAILURE_SERVICE_NAME_CONFLICT` and
`FAILURE_HOST_NAME_CONFLICT`.

Bug: 284904661
Test: atest CtsNetTestCases FrameworksNetTests

Change-Id: I2fb974c38d851ba99144a18c7047084bbd61b938

Handa Wang   commited 2024-01-29 06:46:43 +00:00
1c2be6b391
Use an integer for query mode
This is a no-op change. Currently, the query mode employs a
boolean value to toggle between passive and active modes. To
accommodate a broader range of query modes for different
requirements, switch to an integer value that facilitating
the addition of new modes more seamlessly.

Bug: 271067818
Test: atest FrameworksNetTests NsdManagerTest
Change-Id: Ia9a12d4581246c3a5776cd241755a10994e32454

Paul Hu   commited 2024-01-29 06:19:24 +00:00
05086bde2d
NetworkUtilsTest.testSetSockOptBytes
Use sec but not usec in the test. setsockopt TimeVal may lose precision
on usec when kernel rounds up the requested value based on the HZ setting:
val = tv.tv_sec * HZ + DIV_ROUND_UP((unsigned long)tv.tv_usec, USEC_PER_SEC / HZ);

Bug: 321577714

Test: atest FrameworksNetTests:android.net.connectivity.android.net.NetworkUtilsTest
Change-Id: I13a12319370ec2bebe0935f2acdef88bca4d963d

Yang Sun   commited 2024-01-29 13:30:53 +08:00
0cd8f7f44d
clean up lint warnings
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If51a297f4fd6b39584d08ed43816167becdc14c8

Maciej Żenczykowski   commited 2024-01-26 15:24:19 -08:00
ff474baf75
rename InterfaceMapUpdater to InterfaceMapHelper
since it doesn't actually update any more...

Done via:
  git grep InterfaceMapUpdater | cut -d: -f1 | sort -u | while read i; do sed -i -r 's@InterfaceMapUpdater@InterfaceMapHelper@g' "$i"; done
  git mv ./tests/unit/java/com/android/server/net/BpfInterfaceMapUpdaterTest.java ./tests/unit/java/com/android/server/net/BpfInterfaceMapHelperTest.java
  git mv ./service-t/src/com/android/server/net/BpfInterfaceMapUpdater.java ./service-t/src/com/android/server/net/BpfInterfaceMapHelper.java

Test: TreeHugger
  atest libnetworkstats_test
  atest FrameworksNetTests:android.net.connectivity.com.android.server.net.BpfInterfaceMapHelperTest
  atest NetworkStackIntegrationTests:android.net.NetworkStatsIntegrationTest
  atest --iterations=100 NetworkStackIntegrationTests:android.net.NetworkStatsIntegrationTest
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I07b57158347757f3f8dc4f24803a9bbf30445f7d

Maciej Żenczykowski   commited 2024-01-26 15:24:19 -08:00
9c82d9e693
remove BpfInterfaceMapUpdater async update functionality
This is no longer needed due to being done synchronously via nativeRegisterIface()

Test: TreeHugger
  atest libnetworkstats_test
  atest NetworkStackIntegrationTests:android.net.NetworkStatsIntegrationTest
  atest FrameworksNetTests:android.net.connectivity.com.android.server.net.BpfInterfaceMapUpdaterTest
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I9c0c79d23657fb5cb5296fb918f76f1fc896baa1

Maciej Żenczykowski   commited 2024-01-26 15:24:19 -08:00
8035dbc881