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
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
Merge "Fix StructXfrmLifetimeCurTest failure when default timezone is not GMT" into main am: 3841508237
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2850828
Change-Id: I64bdb4d5bcf74eab78b3b3a750ca1e4c4820b8d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Yan Yan
authored and
Automerger Merge Worker
commited 2023-11-30 02:49:08 +00:00
f89a502bde
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
Fix StructXfrmLifetimeCurTest failure when default timezone is not GMT
...
Previously the calculation of the expected ADD_TIME implicitly depended
on the default timezone of the test device and thus might have
different values and cause test failures. This fix updates the test to
always use "GMT" to generate the ADD_TIME
Bug: 308011229
Test: StructXfrmLifetimeCurTest passing with default timezone being
GMT, GMT-6, GMT-10
Change-Id: Ib88a253c1ecb09feeb298a04b847c4105651a710
Yan Yan
commited 2023-11-29 00:15:07 +00:00
17b7a74041
Merge changes Ibd38e3c0,I0e9f52aa into main am: 7475acf7e2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2825232
Change-Id: I42963fba38678ebd755c8059e3cb695eb68439d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Yan Yan
authored and
Automerger Merge Worker
commited 2023-11-28 23:27:43 +00:00
481d6d4acf
Merge changes Ibd38e3c0,I0e9f52aa into main
...
* changes:
[XFRM_MSG_NEWSA] Support xfrm_lifetime_cfg and xfrm_lifetime_cur
[XFRM_MSG_NEWSA] Support xfrm_selector and xfrm_id
Yan Yan
authored and
Gerrit Code Review
commited 2023-11-28 22:51:44 +00:00
7475acf7e2
Merge "Update bug component in xfrm folder OWNER file." into main am: 8671ebc068
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2845496
Change-Id: I2dd93bdc620a56711b20a544739ee81ca5541e3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Xiao Ma
authored and
Automerger Merge Worker
commited 2023-11-28 11:12:43 +00:00
98c8bdd9b2
Update bug component in xfrm folder OWNER file.
...
Change the component number to 685852 which is used for IpSec. and also
add OWNER file for xfrm unit test folder.
Test: TH
Change-Id: I2359d6d8c6b3916ce36fdbcc1f487896efb0dccb
Xiao Ma
commited 2023-11-28 11:54:41 +09:00
9224b1019a
Merge "[XFRM_MSG_GETSA] Support XFRM_MSG_GETSA message" into main am: 684f92b9fb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2825612
Change-Id: I6ccfa9c92a8a23055073bc73ae786909df3385e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Yan Yan
authored and
Automerger Merge Worker
commited 2023-11-28 00:48:51 +00:00
4152c7848d
[XFRM_MSG_NEWSA] Support xfrm_lifetime_cfg and xfrm_lifetime_cur
...
Bug: 308011229
Test: atest NetworkStaticLibTests:com.android.net.moduletests.util.netlink
(new tests added)
Change-Id: Ibd38e3c0036c760f6397910162054cfb02e45059
Yan Yan
commited 2023-11-27 12:10:59 -08:00
7a82062499
[XFRM_MSG_NEWSA] Support xfrm_selector and xfrm_id
...
Bug: 308011229
Test: atest NetworkStaticLibTests:com.android.net.moduletests.util.netlink
(new tests added)
Change-Id: I0e9f52aad8e9cb72b8bbac1f9ee9f8e53d939e47
Yan Yan
commited 2023-11-27 12:10:52 -08:00
97ea643797
[XFRM_MSG_GETSA] Support XFRM_MSG_GETSA message
...
Bug: 308011229
Test: atest NetworkStaticLibTests:com.android.net.moduletests.util.netlink
(new tests added)
Change-Id: I42e423c09ffb733a809636360468c963c7864872
Yan Yan
commited 2023-11-27 12:10:46 -08:00
c5e280590a
Move the owner of xfrm netlink source code to its own directory. am: 4ba5edcb8a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2842801
Change-Id: Ic7c3f2f22bef33086bbad0217d427596a439311d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Xiao Ma
authored and
Automerger Merge Worker
commited 2023-11-22 10:12:28 +00:00
c493c4b487
Move the owner of xfrm netlink source code to its own directory.
...
Test: TH
Change-Id: I260665a0afa056e32021c5255a17ea0af59b6575
Xiao Ma
commited 2023-11-22 18:50:00 +09:00
4ba5edcb8a
Merge "[XFRM_MSG_GETSA] Fix the class names and code locations" into main am: ecda769a25
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2838538
Change-Id: If44b5206daa9acbd6fe672c8523fe58ff597266c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Yan Yan
authored and
Automerger Merge Worker
commited 2023-11-22 01:59:27 +00:00
0828b313c8
Merge "[XFRM_MSG_GETSA] Fix the class names and code locations" into main
Yan Yan
authored and
Gerrit Code Review
commited 2023-11-22 01:31:01 +00:00
ecda769a25
[XFRM_MSG_GETSA] Fix the class names and code locations
...
- Change class names to start with Xfrm or StructXfrm for consistency
with other messages and structs
- Create xfrm sub-folder for xfrm messages
- Add "finals" to input parameters
Bug: 308011229
Test: atest NetworkStaticLibTests:com.android.net.moduletests.util.netlink
(new tests added)
Change-Id: Id6d34b4549bbc1890b3f4dd9f1638977f66e3236
Yan Yan
commited 2023-11-21 19:21:32 +00:00
f085fadfdc
Delete mdns_aidl_interface-lateststable-java am: a3b4febfe5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2836114
Change-Id: I2881e1a513b765c7ae737aed68e0257efba3aba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Ken Chen
authored and
Automerger Merge Worker
commited 2023-11-21 09:29:42 +00:00
b4ae49886d
Delete mdns_aidl_interface-lateststable-java
...
It's no longer needed because the only useful version is v1 and all
functions are deprecated in v2.
Bug: 298594687
Test: m
Change-Id: I0226b7f3d3cda6fb897e02a035e84943913a944e
Ken Chen
commited 2023-11-21 09:04:03 +00:00
a3b4febfe5
Merge "Improve message for SIM cards not supporting data" into main am: 10c33ca574
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2836315
Change-Id: I3c393d9db33019e2eb94b33c4c2ab512e5289b0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Treehugger Robot
authored and
Automerger Merge Worker
commited 2023-11-19 15:17:15 +00:00
4f67f253f8
Merge "Improve message for SIM cards not supporting data" into main
Treehugger Robot
authored and
Gerrit Code Review
commited 2023-11-19 14:48:31 +00:00
10c33ca574
Merge "Make thread leak error message more readable" into main am: e9a5de9fba
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2831654
Change-Id: Iec7c84038923a27aac708517ade17abf0c0347b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Junyu Lai
authored and
Automerger Merge Worker
commited 2023-11-17 09:12:39 +00:00
f81b7ed5f2
Merge "Make thread leak error message more readable" into main
Junyu Lai
authored and
Gerrit Code Review
commited 2023-11-17 08:34:42 +00:00
e9a5de9fba
Make thread leak error message more readable
...
This change only outputs thread count differences instead of
listing all threads. Additionally, it ignores threads with 1
count, which effectively filter out threads created
by the test runner or other system components, such as
hwuiTask*, queued-work-looper, SurfaceSyncGroupTimer,
RenderThread, and Time-limited test.
Sample Output:
[1122/3060] android.net.connectivity.com.android.server.CSLocalAgentCreationTests#ThreadLeakMonitor: FAILED (1ms)
STACKTRACE:
java.lang.IllegalStateException: Unexpected thread changes: removed=[] added=[] updated=[TestAlarmManager=25,CSTestHandler=25]
Test: atest ConnectivityCoverageTests
(with shouldThreadLeakFailTest set to true)
Bug: 310581973
Bug: 307693729
Change-Id: I085799ebbd69c29f833335684de208105302e012
Junyu Lai
commited 2023-11-17 15:05:19 +08:00
c034c7217e
Improve message for SIM cards not supporting data
...
The previous message is not clear about the fact that there is
a SIM card inserted. Clarify it.
Change-Id: I2391d9fa7762b6225438049199f9f178a8b24d41
Remi NGUYEN VAN
commited 2023-11-17 04:14:39 +00:00
1af3d90f24
Merge "BpfRingBuf.h - implement wait()" into main am: b0b38f6b69
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2826190
Change-Id: I5aebb838d79ca9d522ddac47b97fed811a8659d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2023-11-17 01:01:51 +00:00
bc9f44a3be
[XFRM_MSG_GETSA] Support xfrm_address_t and xfrm_usersa_id am: 1c363601a1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2825610
Change-Id: I7bbfc85e4f17b03e9a607bd4b62d3060f584cdaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Yan Yan
authored and
Automerger Merge Worker
commited 2023-11-17 01:01:39 +00:00
8727cb4f80
Merge "BpfRingBuf.h - implement wait()" into main
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2023-11-17 00:35:26 +00:00
b0b38f6b69
[XFRM_MSG_GETSA] Support xfrm_address_t and xfrm_usersa_id
...
Add xfrm_address_t and xfrm_usersa_id structs
Bug: 308011229
Test: atest NetworkStaticLibTests:com.android.net.moduletests.util.netlink
(new tests added)
Change-Id: I552983d7e768e7fb8ba307ffc55060c8b35e7436
Yan Yan
commited 2023-11-16 21:46:43 +00:00
1c363601a1
Merge "BpfUtils.java - add requires T+ annotation" into main am: fdcf0111c3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2800575
Change-Id: Ic30ed48cd45431be572185b19994734d8346c167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2023-11-16 11:12:58 +00:00
5c99093caf
Merge "BpfUtils.java - add requires T+ annotation" into main
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2023-11-16 11:06:57 +00:00
fdcf0111c3
Merge "BpfMap.java - add requires S+ annotation" into main am: 50ad91350a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2801093
Change-Id: Ied7601318c22fe28f5346e33f2be978642607369
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2023-11-16 11:01:43 +00:00
bf175e623b
BpfUtils.java - add requires T+ annotation
...
Networking bpf (including cgroup related portions)
was mainlined in Android T.
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I779584828f03caa2d61d5081cb3d39566db9b9de
Maciej Żenczykowski
commited 2023-11-16 01:57:46 +00:00
1df0aafcc3
BpfMap.java - add requires S+ annotation
...
Since the first mainline eBPF code (for Tethering offload)
landed in Android S.
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ifb44a43a98e7f0ff4cd59017b47f64eff30ee715
Maciej Żenczykowski
commited 2023-11-16 01:45:46 +00:00
6f776f5af3
Merge "Migrate to netd_aidl_interface-V14" into main am: 9397e4ebd3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2825798
Change-Id: I50198a217d21426ade757a699475f21ae7e94a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Ken Chen
authored and
Automerger Merge Worker
commited 2023-11-15 14:33:07 +00:00
fe4178a04c
Merge "Migrate to netd_aidl_interface-V14" into main
Ken Chen
authored and
Gerrit Code Review
commited 2023-11-15 14:26:10 +00:00
9397e4ebd3
Merge "Add @deprecated annotation and bump netd_aidl_interface" into main am: ba716f2195
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2825797
Change-Id: I3dfa3fcd88cb0fdc3112e0dc2bd69e8b1092fda7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Ken Chen
authored and
Automerger Merge Worker
commited 2023-11-15 11:17:03 +00:00
eebc6ca2b0