Commit graph android_packages_modules_Co.../tests/unit/java/com/android/server
Message SHA1
Merge "Fix wrong request_count in connectivityStateSample and add tests" into main
Treehugger Robot   authored and   Gerrit Code Review   commited 2024-03-12 13:38:22 +00:00
94a79994cd
Fix wrong request_count in connectivityStateSample and add tests
This CL updates CSTest to use mocked appOpsManager to bypass
checkPackage enforcement so that test can file network request as
SYSTEM_UID

Bug: 314627716
Test: atest ConnectivitySampleMetricsTest
Change-Id: I0a5f3b1bf2c343644e6f5e2a4ec1b0460e2645c4

Motomu Utsumi   commited 2024-03-12 19:07:08 +09:00
e08de4d322
Merge "follow up comments in custom TTL CLS (aosp/2870274 and aosp/2606573)" into main
Treehugger Robot   authored and   Gerrit Code Review   commited 2024-03-11 11:18:27 +00:00
96f6a077e6
Merge "Use Service handler thread for NetworkStatsObservers" into main
Junyu Lai   authored and   Gerrit Code Review   commited 2024-03-08 07:41:08 +00:00
1ffd5dcbc1
Merge "Merge Android 14 QPR2 to AOSP main" into main
Xin Li   authored and   Gerrit Code Review   commited 2024-03-07 06:41:03 +00:00
612de50da2
Use Service handler thread for NetworkStatsObservers
This change includes:
  1. Use service handler looper when initializing the observers
     to simplify the structure.
  2. Make the handler variable final in the observers class.
  3. Remove misleading comments, where the callback events
     are actually dispatched on the oneway binder thread,
     which does not block handler thread.
  4. Update tests accordingly.

Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.net.NetworkStatsServiceTest
Test: atest FrameworksNetIntegrationTests:com.android.server.net.integrationtests.NetworkStatsIntegrationTest
Test: atest CtsNetTestCases:NetworkStatsManagerTest
Bug: N/A
Change-Id: I5be92853b5bbc795a36bf774956bdac33d79099b

Junyu Lai   commited 2024-03-06 18:09:03 +08:00
8b1d824ad2
Revert "Log bpf rc file if it differs from the template files."
This reverts commit 41557553f6.

(this is no longer needed, as it rolled out with January module,
while the May module this is targetting already includes an rc,
thus eliminating the need for this warning)

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I90c8abad2f70d65d142f55c18ad2f34018da6615

Maciej Żenczykowski   commited 2024-03-05 19:49:20 -08:00
cf3d20011c
follow up comments in custom TTL CLS (aosp/2870274 and aosp/2606573)
Summary of major changes in this CL:
1. update javadoc in AdvertisingRequest to start with one line
2. update ttl API document to ve clearer that values smaller than 1
   second is discarded
3. Remove redundant constructors of MdnsServiceInfo
4. add tests for MdnsRecordRepository to verify that addService works
   with non-null TTL

Other comments needs more consideration and relatively larger change, so
tracked in separated child issue of b/327619631

Bug: 327619631
Change-Id: I040b8451337d88d96da7120455c228cef204f768

Kangping Dong   commited 2024-03-05 20:04:48 +08:00
c6622e02b7
Merge "Update the imports to androidx.test.filters.*" into main am: 64a8fa9d13
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2983295

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

Ram Peri   authored and   Automerger Merge Worker   commited 2024-03-01 17:22:19 +00:00
7e6d34064a
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 am: 0df28d82be
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2981695

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

Chiachang Wang   authored and   Automerger Merge Worker   commited 2024-03-01 01:40:56 +00:00
04e109be0d
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 am: 0520e26936
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2870274

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2024-02-29 21:43:03 +00:00
feb96d866d
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 am: d4b802064b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2632298

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2024-02-28 16:18:43 +00:00
935f568351
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 "SatelliteAccessController enhancements to handle Multiple User" into main am: 63ff28ed54
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2954926

Change-Id: Ic696199bfc6996d3a92a42deb76380e3421087cc
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-26 17:22:44 +00:00
bc55087fc2
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 am: c91b22be98
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2950126

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

Chiachang Wang   authored and   Automerger Merge Worker   commited 2024-02-26 06:31:35 +00:00
9553538169
Merge "Add methods to support verifying captive portal launch" into main am: 3023965cf8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2967207

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

Chiachang Wang   authored and   Automerger Merge Worker   commited 2024-02-26 06:31:22 +00:00
2acee58a78
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 am: 52f6a8a28e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2896801

Change-Id: I32649e614f8d3225bd357bb216480460b30cc551
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:22:23 +00:00
36e39722c9
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: Id557bf1a5924575ecb7ae7181851cb87bcf0e868
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 07:04:18 +00:00
f611317a89
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
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: Id58458b8523d74d70ee2a9a2ed93195949c8a253
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:21:32 +00:00
7d5d380a36
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: Iedfcf255b785b575a3e2a86a21d54f5b845abd0e
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:39:42 +00:00
9f63dd7e7f
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: I25812dc9c3c572c6e4632e47a757016bc5ff16b6
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:08:31 +00:00
03783acc09
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: Icdf081cc8be09db2d565c71df2c076fc51b76f7b
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:40:49 +00:00
efc6ab3a12
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: If8bd3b19cc92d535d0b0c54a4af02a16cfd869fa
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:40:45 +00:00
8527398178
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: Id237ef42aec76d380a3d0d400a9a7943364de154
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:05:31 +00:00
8a3f368be7
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: Iccc4355f5581f839aac4cbbfa8ec28c02f1ee439
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:43:59 +00:00
4829747946
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