Merge "[XFRM_MSG_NEWSA] Support polling SA state with netlink message" into main am: 96db51b377
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2833751
Change-Id: I3a2313c45309580e5b59a77ad3c817e5d3df1b8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Yan Yan
authored and
Automerger Merge Worker
commited 2023-12-11 23:55:54 +00:00
be098d648e
Merge "[XFRM_MSG_NEWSA] Support polling SA state with netlink message" into main
Yan Yan
authored and
Gerrit Code Review
commited 2023-12-11 23:27:17 +00:00
96db51b377
Merge "[BR14] Tracker Data Saver status in ConnectivityService" into main am: 5ad399d8c3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2856948
Change-Id: I78fbb447cb931a95f85e5fc4ea6e18c5de7b0030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Junyu Lai
authored and
Automerger Merge Worker
commited 2023-12-11 22:49:54 +00:00
9e48252de8
[XFRM_MSG_NEWSA] Support polling SA state with netlink message
...
Bug: 308011229
Test: IpSecXfrmControllerTest
Change-Id: Id765cd8d8d7e330969877cb0890bd828417fb6b8
Yan Yan
commited 2023-12-11 18:43:34 +00:00
4df361975d
Merge "[BR14] Tracker Data Saver status in ConnectivityService" into main
Junyu Lai
authored and
Gerrit Code Review
commited 2023-12-11 10:09:57 +00:00
5ad399d8c3
[BR14] Tracker Data Saver status in ConnectivityService
...
BYPASS_INCLUSIVE_LANGUAGE_REASON=Using public API
Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.CSBpfNetMapsTest
(on U and V devices respectively)
Bug: 297836825
Fix: 314858283
Change-Id: Ibeac8cd3a33468c6539234255328affc6b3f8ffe
Junyu Lai
commited 2023-12-08 13:54:29 +08:00
38c7503ab5
Replace MdnsPointerRecord contructor usage for queries am: 516e27f9c3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2856947
Change-Id: Ie64f006ffc8fe44ae12d77bbc4fc1a27e09e4185
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Paul Hu
authored and
Automerger Merge Worker
commited 2023-12-07 11:25:33 +00:00
9dd5441643
Replace MdnsPointerRecord contructor usage for queries
...
This is a test only change, replacing the MdnsPointerRecord
constructor usage for queries with the new version.
Bug: 312657709
Test: atest FrameworksNetTests
Change-Id: Ie9e51df78bfc27090503b861c5ac979201f10608
Paul Hu
commited 2023-12-07 08:38:48 +00:00
516e27f9c3
Merge "Remove unused Vpn Dependency methods in VpnTest." into main am: 997bb6c79e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2849535
Change-Id: I5f70f5896c4e400734081b8d2ea3cd041264b2f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Hansen Kurli
authored and
Automerger Merge Worker
commited 2023-12-04 05:43:00 +00:00
5fc70b561a
Merge "Remove unused Vpn Dependency methods in VpnTest." into main
Hansen Kurli
authored and
Gerrit Code Review
commited 2023-12-04 05:23:06 +00:00
997bb6c79e
Merge "Add support to update the registered service in place" into main am: 283ff70585
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2817455
Change-Id: Ic9bad3fdfb9d8c0cbcbc4d7d96453e053772b0cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Yuyang Huang
authored and
Automerger Merge Worker
commited 2023-12-02 09:17:08 +00:00
f1b3a800b4
Merge "Add support to update the registered service in place" into main
Yuyang Huang
authored and
Gerrit Code Review
commited 2023-12-02 08:49:23 +00:00
283ff70585
Add support to update the registered service in place
...
The current implementation of MdnsAdvertiser doesn't support updating an
existing registration. For an update request, the client needs to
unregister it first, which will trigger an exit message and then
register again, which will trigger an announcement message. There are
some clients that don't want to trigger the exit and announcement
message every time. This CL adds the API to support that use case.
Bug: 309372239
Test: TH
Change-Id: Iabe69a987a11104090082e01969e7595f05504e8
Yuyang Huang
commited 2023-12-01 18:15:58 +09:00
e5cba9cb87
Merge "Update registerOffloadEngine() permission check" into main am: 4c969a65ae
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2848455
Change-Id: I1b8b63c909a6fcad359f6ca322eed9031db07e63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Yuyang Huang
authored and
Automerger Merge Worker
commited 2023-11-30 06:23:55 +00:00
4c9c1a5c1f
Merge "Update registerOffloadEngine() permission check" into main
Yuyang Huang
authored and
Gerrit Code Review
commited 2023-11-30 05:57:02 +00:00
4c969a65ae
Merge "Log bpf rc file if it differs from the template files." into main am: 8670809d7f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2849354
Change-Id: Ic7987def03c8311cd1228faab09048865d60ffca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Yuyang Huang
authored and
Automerger Merge Worker
commited 2023-11-30 03:55:03 +00:00
067ec832af
Merge "Log bpf rc file if it differs from the template files." into main
Yuyang Huang
authored and
Gerrit Code Review
commited 2023-11-30 03:32:56 +00:00
8670809d7f
Log bpf rc file if it differs from the template files.
...
Check if the bpf loader rc file is differs from the template files when
ConnectivityService starts. Use Log.wtf() to log the file if there is a
diff.
Bug: 312638861
Test: TH
Change-Id: I0b9ed9962ad0954a051a17b01357d04a0e655ff4
Yuyang Huang
commited 2023-11-29 19:58:15 +09:00
41557553f6
Update registerOffloadEngine() permission check
...
Update registerOffloadEngine() permission check to check the
DEVICE_POWER permission in U. This change is required to allow the
android TV device to access the API in U because the
REGISTER_NSD_OFFLOAD_ENGINE permission can not be backported.
Bug: 313546516
Test: TH
Change-Id: I84b80d102a34487ad54719a86eb525b319e2fd8b
Yuyang Huang
commited 2023-11-29 13:38:40 +09:00
d5896e7721
Merge "Replace useTls with mode in PrivateDnsConfig" into main am: 452feb2620
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2842798
Change-Id: I552c4eae2837ac730e8a3cfe1f19190c28b52cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Mike Yu
authored and
Automerger Merge Worker
commited 2023-11-29 02:12:26 +00:00
d2f934a727
Replace useTls with mode in PrivateDnsConfig
...
In PrivateDnsConfig class, `useTls` is replaced with `mode`.
This CL a corresponding change.
Bug: 240259333
Test: atest ConnectivityCoverageTests
Change-Id: I60c53e52f287fc7fa05543603a62632d934bb2e6
Mike Yu
commited 2023-11-28 07:49:58 +00:00
9738b47758
Remove unused Vpn Dependency methods in VpnTest.
...
Vpn.Dependencies contains methods used for legacy VPNs that are
now unused. Remove them.
Bug: 161776767
Test: atest FrameworksNetTests
Change-Id: I68bbb3e519f5558f9006f680df79ae8073e196cd
Hansen Kurli
commited 2023-11-28 15:49:14 +08:00
b27602c8d9
Merge "Prompt user to add data on mobile portals" into main am: 5db2089717
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2632310
Change-Id: I5c7e529b5ae2fc35545d453b75950a879a2ea339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2023-11-27 03:35:16 +00:00
6fc0bfcf75
Merge "Prompt user to add data on mobile portals" into main
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2023-11-27 02:45:14 +00:00
5db2089717
Merge "Revert "Prioritize non-slices over slices"" into main am: 11162e97c6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2840317
Change-Id: I055769cfd04ff6e120cc9a3f99ad08a7ac91f547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Jean Chalard
authored and
Automerger Merge Worker
commited 2023-11-24 03:26:47 +00:00
6454939961
Merge "Revert "Prioritize non-slices over slices"" into main
Jean Chalard
authored and
Gerrit Code Review
commited 2023-11-24 02:50:35 +00:00
11162e97c6
Prompt user to add data on mobile portals
...
On mobile networks it is more likely that the user needs to top up or
get a mobile data subscription, rather than "sign in" as the previous
messaging was suggesting.
Following feedback from interaction designers / UX writers, change the
strings to be more appropriate for the most common use-case.
Bug: 153673376
Test: atest FrameworksNetTests
manual test on mobile network force-detecting a portal.
Change-Id: I5b4d4a17fd507d8cf3c9863cf23b5fedb258852e
Remi NGUYEN VAN
commited 2023-11-24 11:02:19 +09:00
3f2ff2e3d7
Merge "Add Thread#join to guarantee the termination of the thread" into main am: 976e52a2c4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2840316
Change-Id: I2ee29b76f2cb1e1c7bd7b5cfd2afafe13df465fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Paul Hu
authored and
Automerger Merge Worker
commited 2023-11-22 06:26:31 +00:00
3fc8be92fb
Merge "Add Thread#join to guarantee the termination of the thread" into main
Paul Hu
authored and
Gerrit Code Review
commited 2023-11-22 06:22:23 +00:00
976e52a2c4
Merge "Fix the memory leak in nsd tests" into main am: 005fb887e6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2814218
Change-Id: I444dfbd7828ab2815f6012c703bf5c8b1f205a5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Paul Hu
authored and
Automerger Merge Worker
commited 2023-11-22 03:03:00 +00:00
23e7336673
Merge "Fix the memory leak in nsd tests" into main
Paul Hu
authored and
Gerrit Code Review
commited 2023-11-22 02:57:24 +00:00
005fb887e6
Merge "Update Andorid.bp to use DnsResolver v13" into main am: faa10d066b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2452966
Change-Id: I2eaa8eaab07a039160890da3a09b451404491cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Mike Yu
authored and
Automerger Merge Worker
commited 2023-11-21 12:37:56 +00:00
aa8b19e205
Merge "Update Andorid.bp to use DnsResolver v13" into main
Mike Yu
authored and
Gerrit Code Review
commited 2023-11-21 12:04:30 +00:00
faa10d066b
Revert "Prioritize non-slices over slices"
...
This reverts commit 14499f0119
Jean Chalard
authored and
Gerrit Code Review
commited 2023-11-21 10:25:14 +00:00
6121a7656c
Add Thread#join to guarantee the termination of the thread
...
Also add MonitorThreadLeak annotation to check thread leak.
Test: atest ConnectivityCoverageTests --test-filter mdns*
Change-Id: Ie47f30360e36784428173f6cc87a4a6b09826405
Paul Hu
commited 2023-11-21 16:08:41 +08:00
0788d8ee7e
Fix the memory leak in nsd tests
...
The NsdManager constructor creates a new thread, which is not
intended to be closed. However, the test in NsdMangerTest and
NsdServiceTest create a new NsdManager instance, resulting in a
large number of threads running during the tests. This can lead
to an out-of-memory error for the tests. To resolve this issue,
use the common singleton thread ConnectivityThread to handle
tasks from the various instances.
Fix: 308544734
Test: atest ConnectivityCoverageTests --test-filter Nsd*
Change-Id: I1908a2bb1bd20da8e0498353bca26f7e89e16626
Paul Hu
commited 2023-11-21 14:04:07 +08:00
27662f0cc3
Merge changes I30f8814c,Ifdf67318,If312b8f8 into main am: 4a013c47c2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2824211
Change-Id: I250900a3251319f67c82f013f48dbc93c7f6afd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Jean Chalard
authored and
Automerger Merge Worker
commited 2023-11-20 07:27:47 +00:00
a067200ebd
Stop CarrierPrivilegeAuthenticator thread in tests am: 96ff954464
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2814217
Change-Id: I121d820c99297e535fe3af30a727e19a43163269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Chalard Jean
authored and
Automerger Merge Worker
commited 2023-11-20 07:27:34 +00:00
018b9ada56
Merge changes I30f8814c,Ifdf67318,If312b8f8 into main
...
* changes:
Rename hasCarrierPrivilege... to isCarrierServiceUid...
Detect discrepancies in subIds
Allow carrier service UIDs to access their own WiFi networks.
Jean Chalard
authored and
Gerrit Code Review
commited 2023-11-20 06:55:04 +00:00
4a013c47c2
Stop CarrierPrivilegeAuthenticator thread in tests
...
Bug: 308519360
Test: CarrierPrivilegeAuthenticatorTest
Change-Id: I59164be00a9e1fcced8538537c1dcabd214f2170
Chalard Jean
commited 2023-11-20 14:31:32 +09:00
96ff954464
Merge "Add more powerful CTS for allowedUids" into main am: 51c80a72d8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2405720
Change-Id: I4a95ac511b1bf7329e281452bb817f0c891d7931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Jean Chalard
authored and
Automerger Merge Worker
commited 2023-11-20 05:17:27 +00:00
bd402334a8
Rename hasCarrierPrivilege... to isCarrierServiceUid...
...
This method tests whether the UID is the carrier service
UID, not whether the UID has carrier privilege.
Note that in normal operation, the carrier service UID always
has carrier privilege.
Test: NetworkAgentTest
Change-Id: I30f8814cc0419a2d6bdbe75fdc82156516eba026
Chalard Jean
commited 2023-11-20 14:01:02 +09:00
8c63ed851f
Allow carrier service UIDs to access their own WiFi networks.
...
Bug: 236669534
Test: New tests in this patch
Change-Id: If312b8f8359888558969c022811d6b203be602a0
Chalard Jean
commited 2023-11-20 14:01:02 +09:00
a093b452f3
Merge "Add more powerful CTS for allowedUids" into main
Jean Chalard
authored and
Gerrit Code Review
commited 2023-11-20 04:44:22 +00:00
51c80a72d8
Add more powerful CTS for allowedUids
...
This tests that the network providers are subject to appropriate
limitations as to what they can set as allowedUids – both in the
positive (can do) case, and the negative (can't do) case.
Test: this
Change-Id: I115e2a4bc02ddcd03ecf2f35130fcb0378da22bd
Chalard Jean
commited 2023-11-20 12:16:39 +09:00
5301778ad8
Update Andorid.bp to use DnsResolver v13
...
Bug: 240259333
Test: atest ConnectivityCoverageTests
Change-Id: I92ab5e1eef7ba1715176e3628222084067d14603
Mike Yu
commited 2023-11-20 01:48:53 +00:00
d0ad17c2d1
Merge "Revert "Make PRIORITIZE_* networks non-default"" into main am: dec578072a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2836091
Change-Id: I6e6b060dbdc6cc61169491d5c0368a72c31912fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Michał Brzeziński
authored and
Automerger Merge Worker
commited 2023-11-17 12:59:30 +00:00
fdd105d2c2
Merge "Revert "Make PRIORITIZE_* networks non-default"" into main
Michał Brzeziński
authored and
Gerrit Code Review
commited 2023-11-17 12:21:56 +00:00
dec578072a
Revert "Make PRIORITIZE_* networks non-default"
...
This reverts commit 30fb9b1ca4
Michał Brzeziński
authored and
Gerrit Code Review
commited 2023-11-17 11:18:56 +00:00
05cba24cd8
Merge "Update test as the parameters are removed from production code" into main am: 35c1bc4fbb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2834370
Change-Id: I9afdecfa54eee753a91af3f79054d52965c09853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Chiachang Wang
authored and
Automerger Merge Worker
commited 2023-11-17 09:13:10 +00:00
a4f44726c4
Yan Yan
authored and
Automerger Merge Worker
commited 
Gerrit Code Review
commited 
Junyu Lai
authored and
Paul Hu
authored and
Hansen Kurli
authored and
Yuyang Huang
authored and
Mike Yu
authored and
Remi NGUYEN VAN
authored and
Jean Chalard
authored and
Michał Brzeziński
authored and
Chiachang Wang
authored and