Message	SHA1
Merge "Make apex availability of net-utils-framework-common explicit" into main am: 1bd5a5f5ec am: 1edbc5e9ee am: bf7af36e66 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2889027 Change-Id: I61b375a004284e1f03b7bdab775b5f69c7e74803 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Spandan Das   authored and   Automerger Merge Worker   commited 2024-01-03 18:30:44 +00:00	74a7271bd8
Merge "Make apex availability of net-utils-framework-common explicit" into main Spandan Das   authored and   Gerrit Code Review   commited 2024-01-03 17:46:31 +00:00	1bd5a5f5ec
Merge "implement Thread Border Router e2e integration test" into main am: 5b96f865cd ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2817100 Change-Id: Ied6091a5d5733019cbb21badf7363c546173003f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Handa Wang   authored and   Automerger Merge Worker   commited 2023-12-26 12:02:04 +00:00	57d9265d54
Merge "implement Thread Border Router e2e integration test" into main Handa Wang   authored and   Gerrit Code Review   commited 2023-12-26 11:41:35 +00:00	5b96f865cd
implement Thread Border Router e2e integration test ... This implements a basic border routing test case (ping) and demonstrates a valid test environment for Thread Border Router test cases. Later we can add more packet verifications and more test cases. Bug: 295843010 Test: atest android.net.ThreadBorderRouterTest Change-Id: Ifb9b6d45539143a227c2bc0ed69b5c3167ef9acd Handa Wang   commited 2023-12-26 15:24:54 +08:00	806f5a1bec
Merge changes from topic "deprecate_mdns_aidl_interface" into main am: 1b57a0eff1 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2836115 Change-Id: I0833f7d6e2418950ddbb88f71fa26c8f6d16cc3d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Ken Chen   authored and   Automerger Merge Worker   commited 2023-12-26 06:52:21 +00:00	7aafebc320
Merge changes from topic "deprecate_mdns_aidl_interface" into main ... * changes: Freeze mdns_aidl_interface Deprecate mdns_aidl_interface Ken Chen   authored and   Gerrit Code Review   commited 2023-12-26 06:44:04 +00:00	1b57a0eff1
Merge changes I71545bee,Ic26cddab,I57b36e66,I71367761,I07e7aa8c into main am: 907c6e377b ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2875214 Change-Id: If95860930caab627fd3ea1a759db1d924e433c0e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Yang Sun   authored and   Automerger Merge Worker   commited 2023-12-25 03:33:38 +00:00	a87e7492fd
Merge "Add netlink attributes field into the InetDiagMessage" into main am: 504f6d6c90 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2864606 Change-Id: I248cd924e6cf34d08588dba21ccf0aa2687eb10c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Chiachang Wang   authored and   Automerger Merge Worker   commited 2023-12-25 03:33:18 +00:00	9f5b1cf19d
Merge changes I71545bee,Ic26cddab,I57b36e66,I71367761,I07e7aa8c into main ... * changes: Use NetlinkUtil to process dump messages in InetDiagMessage. Add mif6ctl struct definition. Add mf6cctl struct definition. Add Mrt6Msg struct for multicast routing support. Add support to dump all multicast routes in NetlinkUtils Yang Sun   authored and   Gerrit Code Review   commited 2023-12-25 03:19:12 +00:00	907c6e377b
Merge "Add netlink attributes field into the InetDiagMessage" into main Chiachang Wang   authored and   Gerrit Code Review   commited 2023-12-25 03:09:42 +00:00	504f6d6c90
Add netlink attributes field into the InetDiagMessage ... Add nlAttrs parameter to store the remaining attributes data. As a part of follow-up work from aosp/2354202, the TCP socket parsing can be done by using existing InetDiagMessage class. The missing piece in the InetDiagMessage class is the possible netlink attributes fields that may be appended after an InetDiagMessage. Bug: 311119352 Bug: 265877161 Test: atest NetworkStaticLibTests Change-Id: I9c34166124fd4efba2ab211bfb537ccce5e774a4 Chiachang Wang   commited 2023-12-25 01:40:13 +00:00	4fc3f4fa15
Use NetlinkUtil to process dump messages in InetDiagMessage. ... Test: atest NetworkStaticLibTests:com.android.net.moduletests.util.netlink.InetDiagSocketTest atest FrameworksNetTests:android.net.connectivity.com.android.server.ConnectivityServiceTest Change-Id: I71545beea8e4d9d9993f473813017f76094dc2e0 Yang Sun   commited 2023-12-22 18:56:19 +08:00	4e3bc16e48
Add mif6ctl struct definition. ... This is used to configure interfaces for multicast routing. Test: atest NetworkStaticLibTests:com.android.net.moduletests.util.structs.StructMif6ctlTest Change-Id: Ic26cddab2d5a9f90f63b0828c3e133d830aa0db4 Yang Sun   commited 2023-12-22 18:51:27 +08:00	03e3ceaab1
Add mf6cctl struct definition. ... This is used to configure multicast routes. Test: atest NetworkStaticLibTests:com.android.net.moduletests.util.structs.StructMf6cctlTest Change-Id: I57b36e6678262f48781b70ab77d49b920c7ddca2 Yang Sun   commited 2023-12-22 18:51:15 +08:00	15d4e023f7
Add Mrt6Msg struct for multicast routing support. ... Test: atest NetworkStaticLibTests:com.android.net.moduletests.util.structs.StructMrt6MsgTest Change-Id: I71367761662117aa6c0af3153039e50266d79259 Yang Sun   commited 2023-12-22 18:05:40 +08:00	50b4fd79fa
Make apex availability of net-utils-framework-common explicit ... This java library is available to the following 1. NetworkStack, a platform app 2. TetheringNext, an app in com.android.tethering The availability to (2) was done implicitly using a baseline map in build/soong/apex/apex.go. Make this explicit in Android.bp Bug: 281077552 Test: m nothing Change-Id: I5738ef1fc153e7ef9ccdde512e61310b0fd1ddbb Spandan Das   commited 2023-12-21 21:58:16 +00:00	2b83e7774c
Add support to dump all multicast routes in NetlinkUtils ... Test: atest NetworkStaticLibTests:com.android.net.moduletests.util.netlink.NetlinkUtilsTest Change-Id: I07e7aa8ce677dafb94891c8075f8822dadcfd6d1 Yang Sun   commited 2023-12-21 10:06:33 +08:00	3ee59057b7
Add mcts tag to MainlineCTS networking test modules which is used for build all the mainline CTS tests. am: 199357ba68 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2882146 Change-Id: Ieddef2c7e4a10d00a433bcca834954857843f7d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tongbo Liu   authored and   Automerger Merge Worker   commited 2023-12-19 13:35:10 +00:00	a25b09d5d0
Add mcts tag to MainlineCTS networking test modules which is used for build all the mainline CTS tests. ... Bug: 316436957 Change-Id: I0e7ab773075fb0dfd154dde45a710d1c1823c914 Tongbo Liu   commited 2023-12-19 11:03:50 +00:00	199357ba68
Add getRtmFamily for RtNetlinkRouteMessage am: 6000558538 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2862526 Change-Id: Ie6e8abfbac45caaa97a56004dae56ff992fe4628 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Yang Sun   authored and   Automerger Merge Worker   commited 2023-12-18 09:03:56 +00:00	7bd10b0d44
Add support for multicast route in RtNetlinkRouteMessage am: 08622b8ecb ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2862269 Change-Id: Id78d933c6a563dce6d26d0dc4569ef2e0df2d975 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Yang Sun   authored and   Automerger Merge Worker   commited 2023-12-18 09:03:51 +00:00	3680b6a6a1
Add support for long values in StructNlAttr am: d4195824ab ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2862266 Change-Id: I7b9e502241d764705355d78f3d584f09c9ae2cf9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Yang Sun   authored and   Automerger Merge Worker   commited 2023-12-18 09:03:48 +00:00	2814107249
Add support for processing netlink dump messages am: 0b2d75c09a ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2862268 Change-Id: I0e087c383adeb383d5492a0d6477f74f5ff86ba5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Yang Sun   authored and   Automerger Merge Worker   commited 2023-12-18 09:03:44 +00:00	d82f9f231e
Add getRtmFamily for RtNetlinkRouteMessage ... Test: atest NetworkStaticLibTests:com.android.net.moduletests.util.netlink.RtNetlinkRouteMessageTest Change-Id: Ifdf5afc4f58ff55bd20cc60e23b17c3138754392 Yang Sun   commited 2023-12-17 17:34:39 +08:00	6000558538
Add support for multicast route in RtNetlinkRouteMessage ... Test: atest NetworkStaticLibTests:com.android.net.moduletests.util.netlink.RtNetlinkRouteMessageTest Change-Id: I2f3d69a5bda81de65e4a36e0db61d98dcf082b2d Yang Sun   commited 2023-12-17 17:31:00 +08:00	08622b8ecb
Add support for long values in StructNlAttr ... Test: atest NetworkStaticLibTests:com.android.net.moduletests.util.netlink.StructNlAttrTest Change-Id: Iaaa7f63a2b550f017a8c75f84b9d69bf9e829a8c Yang Sun   commited 2023-12-16 21:58:15 +08:00	d4195824ab
Add support for processing netlink dump messages ... Test: atest NetworkStaticLibTests:com.android.net.moduletests.util.netlink.NetlinkUtilsTest Change-Id: I15e208dca5ed6a723585f79cf09276017bc8a885 Yang Sun   commited 2023-12-16 21:58:07 +08:00	0b2d75c09a
Freeze mdns_aidl_interface ... All AIDL interfaces need to be a stable version in release branch. Bug: 298594687 Test: m Change-Id: Ia81eb29214f3ff76ca21c3ac098d26c4e8d9440d Ken Chen   commited 2023-12-13 10:09:45 +08:00	15e2374a87
Deprecate mdns_aidl_interface ... Mark @Deprecated in mdns_aidl_interface functions in the latest unstable version. Bug: 298594687 Test: m mdns_aidl_interface-update-api Change-Id: I5a5799de7b58e334bddec81bfada7f976038f457 Ken Chen   commited 2023-12-13 10:09:32 +08:00	fe523c2a8b
Merge changes I395560fb,If6abc33c into main am: 336f3c1084 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2862267 Change-Id: Ib9362795fb05b250ff6c21cd350b80225835cd9c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Yang Sun   authored and   Automerger Merge Worker   commited 2023-12-12 13:14:40 +00:00	7e0d608b08
Merge changes I395560fb,If6abc33c into main ... * changes: Add support for NLM_F_DUMP request in StructNLMsgHdr Mark NetworkStaticLibTestsLib as test for lint Yang Sun   authored and   Gerrit Code Review   commited 2023-12-12 12:46:55 +00:00	336f3c1084
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
[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
Add support for NLM_F_DUMP request in StructNLMsgHdr ... Test: atest NetworkStaticLibTests:com.android.net.moduletests.util.netlink.StructNlMsgHdrTest Change-Id: I395560fb1edfb1c806b2ed4c74a7a3081c7b2515 Yang Sun   commited 2023-12-09 20:03:43 +08:00	9ea3be13fc
Merge "[XFRM_MSG_NEWSA] Support xfrm_replay_state_esn and XFRM_MSG_NEWSA" into main am: b94bd28e33 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2833750 Change-Id: Ic3239ce93b92d067f5148d09a12f675d6ff35388 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Yan Yan   authored and   Automerger Merge Worker   commited 2023-12-07 23:24:31 +00:00	f72998b316
Merge "[XFRM_MSG_NEWSA] Support xfrm_replay_state_esn and XFRM_MSG_NEWSA" into main Yan Yan   authored and   Gerrit Code Review   commited 2023-12-07 22:55:48 +00:00	b94bd28e33
Merge "Add a new PIO flag: DHCPv6-PD preferred flag." into main am: f75eacd3f5 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2861287 Change-Id: I85ea0ceb9b561d5c9c9871bb9309a7e70e7faf4b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Xiao Ma   authored and   Automerger Merge Worker   commited 2023-12-06 13:17:19 +00:00	3b151743fb
Merge "Add a new PIO flag: DHCPv6-PD preferred flag." into main Xiao Ma   authored and   Gerrit Code Review   commited 2023-12-06 12:48:33 +00:00	f75eacd3f5
Mark NetworkStaticLibTestsLib as test for lint ... This can avoid VisibleForTesting warnings in tests. Test: atest NetworkStaticLibTests Change-Id: If6abc33cf266246aeac22ff4b53cfba386c8979f Yang Sun   commited 2023-12-06 19:57:29 +08:00	d5c0276b34
Add a new PIO flag: DHCPv6-PD preferred flag. ... The new P flag is defined in https://datatracker.ietf.org/doc/draft-ietf-6man-pio-pflag/. Bug: 315069348 Test: TH Change-Id: Ie386cc8b9fbe136333b46c73da785e02983a582b Xiao Ma   commited 2023-12-06 13:41:07 +09:00	594e34f09a
Merge "[XFRM_MSG_NEWSA] Support xfrm_stats and xfrm_usersa_info" into main am: 4e6bd8f7d4 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2826700 Change-Id: I360d83fd30cd1ebd51411362d279ac6b76c28f7d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Yan Yan   authored and   Automerger Merge Worker   commited 2023-12-05 21:10:42 +00:00	e45434231b
Merge "[XFRM_MSG_NEWSA] Support xfrm_stats and xfrm_usersa_info" into main Yan Yan   authored and   Gerrit Code Review   commited 2023-12-05 20:26:33 +00:00	4e6bd8f7d4
[XFRM_MSG_NEWSA] Support xfrm_replay_state_esn and XFRM_MSG_NEWSA ... Bug: 308011229 Test: atest NetworkStaticLibTests:com.android.net.moduletests.util.netlink (new tests added) Change-Id: I4c21a64c634b1814d52ce81a48abe2550876b755 Yan Yan   commited 2023-12-05 10:49:16 -08:00	0a892e6ec2
[XFRM_MSG_NEWSA] Support xfrm_stats and xfrm_usersa_info ... Bug: 308011229 Test: atest NetworkStaticLibTests:com.android.net.moduletests.util.netlink (new tests added) Change-Id: I8641cf36a790d7b15fbe41b4da328c1d91fcec1e Yan Yan   commited 2023-12-05 10:36:09 -08:00	c9a194c44b
Merge "Return error Status from BpfHandler::initPrograms()" into main am: ed353e90e2 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2849875 Change-Id: I0e7dce3b97c0b5547097a27028ef0bff7f623d23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Ken Chen   authored and   Automerger Merge Worker   commited 2023-12-04 10:20:31 +00:00	c2dbe52eeb
Merge "Return error Status from BpfHandler::initPrograms()" into main Ken Chen   authored and   Gerrit Code Review   commited 2023-12-04 09:52:18 +00:00	ed353e90e2
Return error Status from BpfHandler::initPrograms() ... Instead of logging and aborting from the BpfHandler::initPrograms(), return a Status object with an error message. The caller NetdUpdatable::libnetd_updatable_init() will log the message. Netd main() will exit and restart. Bug: 312094533 Test: m Change-Id: I6717da871a9a53357ac895709ea0094c089e7bbd Ken Chen   commited 2023-12-03 23:45:47 +08:00	d6ea75ac97
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