Merge "Support mDns Known-Answer Suppression" into main am: 0db97a6f93
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2842955
Change-Id: Id833847eead3487b5f9545f59fd32fd6e7f98f29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Paul Hu
authored and
Automerger Merge Worker
commited 2023-12-22 09:07:58 +00:00
fdd030ea37
Merge "Support mDns Known-Answer Suppression" into main
Paul Hu
authored and
Gerrit Code Review
commited 2023-12-22 08:32:29 +00:00
0db97a6f93
Merge "Implement NetworkRequestsState atom" into main am: 0d8a980059
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2868526
Change-Id: I03fa190fd796b7bd7b21bb04b2db8ad34ef44628
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Danuta Brotikovskaya
authored and
Automerger Merge Worker
commited 2023-12-21 18:46:00 +00:00
77ff297f2a
Merge "Implement NetworkRequestsState atom" into main
Danuta Brotikovskaya
authored and
Gerrit Code Review
commited 2023-12-21 18:02:50 +00:00
0d8a980059
Implement NetworkRequestsState atom
...
Bug: 278833398
Test: atest FrameworksNetTests
Change-Id: Ie83bf49693411e4c3f629c07d98071505f48c08f
Danuta Brotikovskaya
commited 2023-12-21 15:56:03 +00:00
e3245081b1
[AF07] Make subclass of NetworkStatsService#Dependencies in the tests am: 16936828a0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2887407
Change-Id: I65b4025dea6a634529301e5888807b2d2f4861de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Junyu Lai
authored and
Automerger Merge Worker
commited 2023-12-21 15:19:11 +00:00
69280c4fa6
[AF07] Make subclass of NetworkStatsService#Dependencies in the tests
...
This is a no-op refactoring that make a subclass of
NetworkStatsService#Dependencies in order to make the
follow-up changes can implement private getters in the
class and easier to review.
Test: TH
Bug: 313841499
Change-Id: If0de525b32abb9ad715c633f42b3c65c0d720d24
Junyu Lai
commited 2023-12-21 10:38:15 +00:00
16936828a0
Merge "Add multi-subtype support to NsdService" into main am: e945c3c28e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2867134
Change-Id: I1e7a2c8de0a00df9ef5c830e7e02d43c6d90c0cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Yuyang Huang
authored and
Automerger Merge Worker
commited 2023-12-20 07:05:58 +00:00
2736c0fe90
Add multi-subtype support to NsdService
...
Allow client to register multi-subtype using comma separate format like:
"_997._tcp,_test1,_test2,_test3"
Bug: 315085895
Test: TH
Change-Id: Ibd27e42cb9e7a0274d1d8df3f6f3a00786e4a237
Yuyang Huang
commited 2023-12-19 15:53:36 +09:00
170d42f15c
Support mDns Known-Answer Suppression
...
Support the RFC 6762 section 7.1. Known-Answer Suppression.
If the response contains an answer that is also present in the
answer section and the known-answer's TTL is greater than half
of the original TTL, suppress the response.
Bug: 312657709
Test: atest FrameworksNetTests NsdManagerTest
Passed DUPLICAE SUPPRESSION test case of BCT
Change-Id: I1890e9fba068c1f59a1d93c3514f0e7d07da1814
Paul Hu
commited 2023-12-19 02:18:53 +00:00
01f243f5a8
Merge changes from topic "mdns-subtypes" into main am: 19d055514c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2850390
Change-Id: I2b7c141d3c9dd3c3c495a86f3bb02f5d7bd08d98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Kangping Dong
authored and
Automerger Merge Worker
commited 2023-12-18 09:04:12 +00:00
cebd6290e4
Merge changes from topic "mdns-subtypes" into main
...
* changes:
[mdns] add service-side impl for subtypes advertising
[mdns] add support for advertising subtypes
Kangping Dong
authored and
Gerrit Code Review
commited 2023-12-18 08:49:44 +00:00
19d055514c
[mdns] add service-side impl for subtypes advertising
...
This is the servide-side impl of the subtypes advertising added in
aosp/2608627. See that CL for more backgrounds.
Bug: 265095929
Test: atest CtsNetTestCases FrameworksNetTests
Change-Id: I3d6f96822ac89d12fe29c00f688d848297c25787
Kangping Dong
commited 2023-12-18 10:03:20 +08:00
5af24b65fe
Merge changes from topic "ipsec-tramsform-state" into main am: 07e425cd0b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2833754
Change-Id: I04a965ac97f38a7f050b4810767165de8d21e347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Yan Yan
authored and
Automerger Merge Worker
commited 2023-12-13 18:59:42 +00:00
ae48dfeff1
Merge changes from topic "ipsec-tramsform-state" into main
...
* changes:
Expose APIs to query the state of an IpSecTransform
Reland "Support getting transform state in IpSecService"
Yan Yan
authored and
Gerrit Code Review
commited 2023-12-13 18:26:25 +00:00
07e425cd0b
Merge "Don't add LOCAL_NETWORK as forbidden capability" into main am: 9efc429906
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2873154
Change-Id: I30b6e0fab64214227a3b79f90a41c7246ca45bce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2023-12-13 06:03:41 +00:00
bf34b52b4f
Merge "Don't add LOCAL_NETWORK as forbidden capability" into main
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2023-12-13 05:35:32 +00:00
9efc429906
Don't add LOCAL_NETWORK as forbidden capability
...
This causes the module to crash on rollback because the current
production code does not consider LOCAL_NETWORK to be a valid
capability.
Change-Id: Idf57d72c384b41b483098c4c302738072ebf7f90
Test: TH
Fix: 313030307
Lorenzo Colitti
authored and
Remi NGUYEN VAN
commited 2023-12-13 11:24:25 +09:00
22941b38f7
Merge "Revert "Support getting transform state in IpSecService"" into main am: bf96d94820
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2871070
Change-Id: I2e630f4ffce8b6fe0a757e6d6f18f653bf7a1785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Yan Yan
authored and
Automerger Merge Worker
commited 2023-12-12 22:35:16 +00:00
e08aa2682b
Reland "Support getting transform state in IpSecService"
...
This reverts commit 69eb8325c0
Yan Yan
authored and
Gerrit Code Review
commited 2023-12-12 22:19:55 +00:00
84fc0ee2d6
Merge "Revert "Support getting transform state in IpSecService"" into main
Yan Yan
authored and
Gerrit Code Review
commited 2023-12-12 22:05:19 +00:00
bf96d94820
Revert "Support getting transform state in IpSecService"
...
This reverts commit ab5006c17d
Yan Yan
authored and
Gerrit Code Review
commited 2023-12-12 21:53:46 +00:00
69eb8325c0
Merge "Support getting transform state in IpSecService" into main am: abf9dcebdd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2833752
Change-Id: I016c426eef04aee8d51e66f4b39cc08c748f790b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Yan Yan
authored and
Automerger Merge Worker
commited 2023-12-12 18:44:19 +00:00
ecb6caf704
Merge "Support getting transform state in IpSecService" into main
Yan Yan
authored and
Gerrit Code Review
commited 2023-12-12 18:23:47 +00:00
abf9dcebdd
Add more timeout for verify the interaction of the mock object am: d0535553c6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2869975
Change-Id: Ia4f86ea7ce18e4fdb50887cfddbababd84e5db9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Chiachang Wang
authored and
Automerger Merge Worker
commited 2023-12-12 09:45:04 +00:00
38b61943c7
Add more timeout for verify the interaction of the mock object
...
The verification happened earlier than the interaction with
production code. This may happen in low performance devices,
e.g. cuttlefish. Add timeout for the verification to deflake
the test.
Bug: 313828402
Test: atest FrameworksNetTests
Change-Id: I1ffa7e7573d503eb0396aa211a90ba032175b3a1
Chiachang Wang
commited 2023-12-12 06:44:29 +00:00
d0535553c6
Support getting transform state in IpSecService
...
Bug: 308011229
Test: IpSecServiceParameterizedTest (new tests)
Change-Id: I3f1c2ef60ee9b6ac17909e0ee083ee6f8483588e
Yan Yan
commited 2023-12-12 00:14:13 +00:00
ab5006c17d
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
Paul Hu
authored and
Automerger Merge Worker
commited 
Gerrit Code Review
commited 
Danuta Brotikovskaya
authored and
Junyu Lai
authored and
Yuyang Huang
authored and
Kangping Dong
authored and
Yan Yan
authored and
Lorenzo Colitti
authored and
Remi NGUYEN VAN
commited 
Chiachang Wang
authored and
Hansen Kurli
authored and
Mike Yu
authored and