Commit graph android_packages_modules_Co.../tests/unit/java/com/android/server
Message SHA1
Merge "Support TrafficStatsRateLimitCache" into main am: 52f6a8a28e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2896801

Change-Id: I158912833f5d09faf0acd510ff7a0e40f71523f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Junyu Lai   authored and   Automerger Merge Worker   commited 2024-02-23 08:18:25 +00:00
683fcd120b
Merge "Support TrafficStatsRateLimitCache" into main
Junyu Lai   authored and   Gerrit Code Review   commited 2024-02-23 07:36:51 +00:00
52f6a8a28e
Merge changes Id512ba6b,Ib57a4a93 into main am: f769efe3e4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2967206

Change-Id: Ib40262aa11a0f88ccb3c08ce45c97990f388c016
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2024-02-22 06:58:27 +00:00
09836ec6b5
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
Merge "Store the SubscriptionId together with the Carrier UID" into main am: 9a5aaaccf6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2956897

Change-Id: Ida00dc41b73a71b43f58e1746f3e10fb96b397c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Ying Xu   authored and   Automerger Merge Worker   commited 2024-02-20 22:17:30 +00:00
65ba2e69bd
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 am: 13a0cc04f6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2954998

Change-Id: I0a8881974584855bf1778998299eb80f8ff08c0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2024-02-13 06:35:15 +00:00
ad70118926
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
Merge "Update CSTest to start thread from setup to avoid thread leak" into main am: 141f7bbfa6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2956087

Change-Id: I9cad86671393d89ff8381e8b2cb61e6a509cf5a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Motomu Utsumi   authored and   Automerger Merge Worker   commited 2024-02-08 11:04:31 +00:00
6b8e6243e4
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 am: 804aa2326d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2940525

Change-Id: I59327832f73c256df74638401ae2c6d5ea0c1add
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Nagendra Prasad Nagarle Basavaraju   authored and   Automerger Merge Worker   commited 2024-02-07 19:33:04 +00:00
465c78bd83
Add SatelliteAccessController class to support messaging on Satellite Internet am: 33c7da3661
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2939960

Change-Id: I30d17a9a189bad2d00045b36e84fc11f9d4cc588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Nagendra Prasad Nagarle Basavaraju   authored and   Automerger Merge Worker   commited 2024-02-07 19:33:00 +00:00
26d9d9203f
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
Support bringing up restricted wifi am: 7cabd32bc5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2917645

Change-Id: Ic0a92e04759cb49e5eacd42cdbd1f18df7bd0412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Ying Xu   authored and   Automerger Merge Worker   commited 2024-02-07 16:01:47 +00:00
0a53aec0b4
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 am: ef58a8a33a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2942985

Change-Id: I762fd1f435998141d4ca778eaaffc76702b79989
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Junyu Lai   authored and   Automerger Merge Worker   commited 2024-02-02 07:39:51 +00:00
ed63f37f7d
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 am: 84cc4e507e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2939460

Change-Id: I54d56d6a8c8bf92f680372fb026170c14f1bd68f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Hansen Kurli   authored and   Automerger Merge Worker   commited 2024-02-02 05:52:12 +00:00
fcb49c63a6
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 am: 742588457a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2939001

Change-Id: I01aaf966c5ea7eeb059371418d10ed4f7edcbe06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2024-02-01 07:50:40 +00:00
e9d900f72d
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
Merge "Simplify the burst time logic" into main am: a906743bc7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2938999

Change-Id: If04a9159aa8ef65c7aef0d34505847812efe2f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Paul Hu   authored and   Automerger Merge Worker   commited 2024-01-31 10:02:46 +00:00
5d787936cf
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 am: 57ead48b11
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2931454

Change-Id: Ib4af3dd17e2cce9301be59ff667af9c358fa228f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2024-01-30 08:02:32 +00:00
5800bb6757
Merge "Add aggressive query mode" into main am: b4fba147cd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2874718

Change-Id: I67d3d4b776dc81937a2b85301f688923bb86f688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Paul Hu   authored and   Automerger Merge Worker   commited 2024-01-30 08:02:09 +00:00
2879f398ec
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 "Enforce package name belongs to the caller's uid" into udc-mainline-prod
Junyu Lai   authored and   Android (Google) Code Review   commited 2024-01-30 02:20:49 +00:00
2e7e2e81ad
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 am: a90737dc23
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2890958

Change-Id: Ia51b96f7d1171730ff7f84afd26f22e09a3f05d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Handa Wang   authored and   Automerger Merge Worker   commited 2024-01-29 08:53:14 +00:00
eb86a13e5b
Merge "Use an integer for query mode" into main am: 22827c3814
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2929831

Change-Id: Id55c0e3a471025aa70026f7716a0e11cecedbba0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Paul Hu   authored and   Automerger Merge Worker   commited 2024-01-29 08:52:55 +00:00
ea36a162b8
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
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
Enforce package name belongs to the caller's uid
Ignore-AOSP-First: Security Fix
Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.net.NetworkStatsServiceTest
Fix: 274443951
Fix: 243376076
Change-Id: I4ef7eff6567b848c8cfa52c51c734642ce929589

Junyu Lai   commited 2024-01-29 13:57:55 +08:00
212c54b344
clean up lint warnings am: ff474baf75
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2927114

Change-Id: Ida917cb95fce50d42f009cdb81030db6e6b4a332
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2024-01-27 02:41:31 +00:00
336ed95eb5
rename InterfaceMapUpdater to InterfaceMapHelper am: 9c82d9e693
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2925601

Change-Id: I0e9c5f49e8516fffc766d947a7b10c2b2f3820a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2024-01-27 02:41:27 +00:00
845d660f06
remove BpfInterfaceMapUpdater async update functionality am: 8035dbc881
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2925600

Change-Id: I32fa947ba95f699fa53f71ae91176fc4e1c541ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2024-01-27 02:41:23 +00:00
d4dd06101d
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