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
Merge "Add @deprecated annotation and bump netd_aidl_interface" into main
Ken Chen
authored and
Gerrit Code Review
commited 2023-11-15 10:54:08 +00:00
ba716f2195
Merge "Ensure no thread leak after NetworkStatsServiceTest" into main am: c7126bb997
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2815929
Change-Id: If85e6e3e325df0ec445761e510c26ee5f851d78b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Junyu Lai
authored and
Automerger Merge Worker
commited 2023-11-15 08:32:45 +00:00
2806c9c260
Merge "Ensure no thread leak after NetworkStatsServiceTest" into main
Junyu Lai
authored and
Gerrit Code Review
commited 2023-11-15 07:45:34 +00:00
c7126bb997
Ensure no thread leak after NetworkStatsServiceTest
...
This change includes:
1. A mechanism in DevSdkIngoreRunnrer to dump thread counts
before/after tests, and compare thread counts to detect leaks.
2. Add an annotation @MonitorThreadLeak for test classes to
annotate the classes which should monitor thread leaks.
3. Annotated NetworkStatsServiceTest to apply the enforcement.
Sample output:
[1/2] android.net.connectivity.com.android.server.net.NetworkStatsServiceTest#testDumpStatsMap: PASSED (1.187s)
[2/2] android.net.connectivity.com.android.server.net.NetworkStatsServiceTest#ThreadLeakMonitor: FAILED (7ms)
STACKTRACE:
java.lang.IllegalStateException: Expected threads: {binder:26055_3=1, Instr: androidx.test.runner.AndroidJUnitRunner=1, main=1, InstrumentationConnectionThread=1, binder:26055_2=1, binder:26055_1=1} but got: {binder:26055_3=1, NetworkStatsObservers=1, Instr: androidx.test.runner.AndroidJUnitRunner=1, main=1, InstrumentationConnectionThread=1, binder:26055_2=1, binder:26055_1=1}
Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.net.NetworkStatsServiceTest \
--rerun-until-failure 100
Bug: 308544001
Bug: 307693729
Change-Id: Ia0bccb82c5985df608b8402009b32626b6b17c5a
Junyu Lai
commited 2023-11-15 14:03:45 +08:00
17f589cf47
Merge changes Ia677f31a,I8d8f5752,Idc347bce into main am: 68219d1031
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2796003
Change-Id: I1b2a65161a773324e68ae59deb69f345f88d73cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Mike Yu
authored and
Automerger Merge Worker
commited 2023-11-14 05:54:43 +00:00
94ef169dd2
Migrate to netd_aidl_interface-V14
...
Test: m
Change-Id: I13f23d63fd9db763958119c5fb440d4e88b7ac8b
Ken Chen
commited 2023-11-13 12:23:44 +08:00
670189a647
Add @deprecated annotation and bump netd_aidl_interface
...
1. Annotate binder interfaces which return
binder::Status::EX_UNSUPPORTED_OPERATION.
2. Freeze netd_aidl_interface to v14.
Test: m
Change-Id: Ibdc083ce7ac4a8e3dcd1e7cf1dc310210ca76f38
Ken Chen
commited 2023-11-13 12:18:53 +08:00
91dc3a102d
Add abstract getValue() for class SvcParam
...
The return type of getValue() in each child class of SvcParam is
checked at compilation time.
Bug: 240259333
Test: atest ConnectivityCoverageTests
Change-Id: Ia677f31a32f40512793cf16a94f64da499594b1f
Mike Yu
commited 2023-11-13 02:52:23 +00:00
4f5930b1e7
Use DnsPacket.toString() for DnsSvcbPacket
...
All the important log message, such as SVCB records, can be printed
by DnsPacket.toString(), so there's no need to override toString()
in DnsSvcbPacket.
Bug: 240259333
Test: atest ConnectivityCoverageTests
Change-Id: I8d8f57524ce07d0177a39a9c3f87146d8eb51943
Mike Yu
commited 2023-11-13 02:52:23 +00:00
9f821e6b68
Test: A minor fix for testDnsSvcbRecord_svcParamMandatory
...
As per draft-ietf-dnsop-svcb-https-12.html#name-mandatory, the
values in SvcParamKey "mandatory" can appear in any order
Bug: 240259333
Test: atest ConnectivityCoverageTests
Change-Id: Idc347bcefd7a53323f2b380fba612926b2838e65
Mike Yu
commited 2023-11-13 02:52:23 +00:00
0b1574d863
BpfRingBuf.h - implement wait()
...
Test: TreeHugger, atest BpfRingbufTest
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I2696077caf4de27dd64e4af1c45a13844ed186c9
Maciej Żenczykowski
commited 2023-11-11 00:59:42 +00:00
ddb0ab8c61
Merge "BpfRingBuf.h - implement isEmpty()" into main am: ca6cf094b9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2824859
Change-Id: I1d61998929aef39b4a67a73a9b418749387a825a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2023-11-10 00:05:54 +00:00
81674db4cb
Merge "BpfRingBuf.h - implement isEmpty()" into main
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2023-11-09 23:20:01 +00:00
ca6cf094b9
BpfRingBuf.h - implement isEmpty()
...
Test: TreeHugger, atest BpfRingbufTest
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I23020869ab665c029c3219b1b39c3749be6e6992
Maciej Żenczykowski
commited 2023-11-09 19:13:40 +00:00
0b99c961bb
Merge "switch SynchronizeKernelRCU back to jni - but from BpfMap" into main am: 2a0a856c17
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2824390
Change-Id: Idccea1a5cd85419013ad92890cebd4a552ba86ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2023-11-09 18:55:04 +00:00
af131772c7
switch SynchronizeKernelRCU back to jni - but from BpfMap
...
we can't use java for this, because pre-U-QPR2 does not include:
https://android-review.googlesource.com/c/platform/system/sepolicy/+/2821590
system_server dontaudit key_socket getopt
so we'll spew lots of:
11-08 07:52:43.776 1469 1469 I auditd : type=1400 audit(0.0:4): avc: denied { getopt } for comm="system_server" scontext=u:r:system_server:s0 tcontext=u:r:system_server:s0 tclass=key_socket permissive=0
11-08 07:52:44.360 1469 1469 I auditd : type=1400 audit(0.0:5): avc: denied { getopt } for comm="NetworkStats" scontext=u:r:system_server:s0 tcontext=u:r:system_server:s0 tclass=key_socket permissive=0
11-08 07:52:44.508 1469 1469 I auditd : type=1400 audit(0.0:7): avc: denied { getopt } for comm="android.bg" scontext=u:r:system_server:s0 tcontext=u:r:system_server:s0 tclass=key_socket permissive=0
and the like.
This is due to Java's Os.close() in:
libcore/luni/src/main/java/libcore/io/BlockGuardOs.java;l=100
calling:
if (fd.isSocket$()) if (isLingerSocket(fd)) ...
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib87fa5e8f0dfd9fbbccb25fb58a9fa78d6a07111
Maciej Żenczykowski
commited 2023-11-09 11:08:58 +00:00
c350db788a
Merge changes from topic "dns_svcb" into main am: d97fdbb3bc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2752417
Change-Id: Ifbf863b623e1e44a72f62b7d3ff55709113de2e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Mike Yu
authored and
Automerger Merge Worker
commited 2023-11-09 05:52:34 +00:00
a831bb67bf