Merge "Fix flaky testSampleConnectivityState" into main am: 2124217588
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2981692
Change-Id: I0f4b47c422caad7b29448b59899dcca6846272af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Motomu Utsumi
authored and
Automerger Merge Worker
commited 2024-02-28 11:51:21 +00:00
cf55c24254
Merge "Fix flaky testSampleConnectivityState" into main
Motomu Utsumi
authored and
Gerrit Code Review
commited 2024-02-28 11:05:01 +00:00
2124217588
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 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 am: 63ff28ed54
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2954926
Change-Id: Ied979519ba293f7912e5412b02dfa039e48d842e
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:18:55 +00:00
c80a670155
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 am: c91b22be98
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2950126
Change-Id: Ia25f2f0eaf4b6711a8e3a3a059a8330cdf1b62d6
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:27:43 +00:00
6ee0fa67e5
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: I067c9dd0f8682abd135b12c4ac9ea6b9ec344e19
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:27:29 +00:00
81fa28768e
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 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: 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
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
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
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: 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 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: 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
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: 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 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: 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 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: 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 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: I20bb3cc39f1059aa03a37863837dbe42a37bfc4a
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:56:24 +00:00
5d679377d4
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: Id980cc0e9ca88e611ac96eb0d6c0990dfdeb43fc
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:54:56 +00:00
20c6c797c8