Merge "Get rid of any unnecessary reset calls" into main am: ce6f14073c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2865435
Change-Id: Ic0daf8a0603fb868e168c5be56c7c9723fabc77d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Mark Chien
authored and
Automerger Merge Worker
commited 2023-12-08 08:13:43 +00:00
bd975a9efc
Merge "Get rid of any unnecessary reset calls" into main
Mark Chien
authored and
Gerrit Code Review
commited 2023-12-08 07:48:14 +00:00
ce6f14073c
Merge "Reference DataSaver setting from BPF map on V+ only" into main am: 86b95d405e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2861608
Change-Id: I2c336981547446de1e9412b422044e3a867b44ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Ken Chen
authored and
Automerger Merge Worker
commited 2023-12-08 07:06:39 +00:00
c3e2e0e0c5
Merge "Reference DataSaver setting from BPF map on V+ only" into main
Ken Chen
authored and
Gerrit Code Review
commited 2023-12-08 06:43:54 +00:00
86b95d405e
Get rid of any unnecessary reset calls
...
Calling resets at the beginning of setUp is unnecessary.
Bug: 315368147
Test: TH
Change-Id: I87030bc867d90752e745fd4a274581d1f3230f85
Mark Chien
commited 2023-12-08 06:34:09 +00:00
4d7b7ecd7e
Merge "[CTS] Mark testGetRedactedNetworkCapabilitiesForPackage ConnectivityModuleTest" into main am: bccd95fab6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2861373
Change-Id: Ie856ef57859bc05447b609ca0ca78a1fe7a26dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Nate Jiang
authored and
Automerger Merge Worker
commited 2023-12-08 03:34:34 +00:00
10b7ececc6
Merge "[CTS] Mark testGetRedactedNetworkCapabilitiesForPackage ConnectivityModuleTest" into main
Nate Jiang
authored and
Gerrit Code Review
commited 2023-12-08 03:24:51 +00:00
bccd95fab6
Merge "Increase the LISTEN_ACTIVITY_TIMEOUT_MS timer" into main am: 3049df0ee0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2861585
Change-Id: Ib3805449d2339134913d7e007cf3d5c329204040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Chiachang Wang
authored and
Automerger Merge Worker
commited 2023-12-08 03:18:49 +00:00
260c7e03e3
Merge "Increase the LISTEN_ACTIVITY_TIMEOUT_MS timer" into main
Chiachang Wang
authored and
Gerrit Code Review
commited 2023-12-08 03:00:17 +00:00
3049df0ee0
Reference DataSaver setting from BPF map on V+ only
...
Only reference DataSaverEnabled map on V+ platform because the
information in map before platform V is not time-precise. See comment in
this commit for detail.
Bug: 288340533
Test: presubmit
Change-Id: I0795e88e6006e6d24d27b63c31d0e3ed81d0262c
Ken Chen
commited 2023-12-08 02:42:51 +00:00
9e1865e48e
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
Add a flag for getIpSecTransformState and IpSecTransformState am: 318b1abbaf
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2860825
Change-Id: I39079547cacb6b572adef6e4c0c93f49d01108d2
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 21:14:32 +00:00
4c12b7917a
Add a flag for getIpSecTransformState and IpSecTransformState
...
Bug: 308011229
Test: make
Change-Id: Ib148b62b375f4f7b6a5d5ca82c74808bffa2e531
Yan Yan
commited 2023-12-07 18:47:24 +00:00
318b1abbaf
Merge "Support network slicing permission check in multi-user environment" into main am: 38f871c8e0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2849536
Change-Id: Ifcca3a806de221a433499127c64438998c21ca75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Treehugger Robot
authored and
Automerger Merge Worker
commited 2023-12-07 12:49:47 +00:00
8acc788f4a
Merge "Support network slicing permission check in multi-user environment" into main
Treehugger Robot
authored and
Gerrit Code Review
commited 2023-12-07 12:32:18 +00:00
38f871c8e0
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
Update testAllowedUids to follow revert of canSeeAllowedUids am: 85cbe604df
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2862525
Change-Id: Icacc4bf85b732d92f5d94e87e2e18f5bfd2c7b9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Motomu Utsumi
authored and
Automerger Merge Worker
commited 2023-12-07 05:01:27 +00:00
9f5d6afd01
Update testAllowedUids to follow revert of canSeeAllowedUids
...
aosp/2854709 reverted canSeeAllowedUids change done by aosp/2405720.
But aosp/2854709 did not update testAllowedUids and broke
testAllowedUids since cts can no longer see allowedUids.
This CL updates testAllowedUids to skip some test cases.
Followup CLs will allow ownerUid to see allowedUids again and re-enable
test cases.
Bug: 315112049
Test: TH
Change-Id: I1e4ca09ad15b6150182325cbfda1548e5fec79d1
Motomu Utsumi
commited 2023-12-07 11:59:34 +09:00
85cbe604df
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
Bill Yi
authored and
Android (Google) Code Review
commited 2023-12-07 00:11:36 +00:00
ed00082d06
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
Merge "Revert canSeeAllowedUids for ownerUid" into main am: 6f95ab2558
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2854709
Change-Id: I3817c625263b68b926bbfab3c1dd810ad6ee08de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Motomu Utsumi
authored and
Automerger Merge Worker
commited 2023-12-06 06:27:37 +00:00
fbbcef0a66
Merge "Revert canSeeAllowedUids for ownerUid" into main
Motomu Utsumi
authored and
Gerrit Code Review
commited 2023-12-06 05:53:00 +00:00
6f95ab2558
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
[CTS] Mark testGetRedactedNetworkCapabilitiesForPackage ConnectivityModuleTest
...
This test require latest Connectivity module
Bug: 314392808
Test: mts-tradefed run mts-wifi
Change-Id: I283ffe9b20af957818584cddfb0d188a5a8625a7
Nate Jiang
commited 2023-12-06 03:56:44 +00:00
14f557181b
Merge "[AF01] Move NetworkStatsCollection comparison code to NetworkStatsCollection" into main am: 2f67e0f2d4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2859025
Change-Id: If6c470d35f65b6d96cbb7348dd9d6bb95fd54ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Junyu Lai
authored and
Automerger Merge Worker
commited 2023-12-06 02:34:11 +00:00
c769ddec10
Merge "[AF01] Move NetworkStatsCollection comparison code to NetworkStatsCollection" into main
Junyu Lai
authored and
Gerrit Code Review
commited 2023-12-06 02:26:14 +00:00
2f67e0f2d4
Merge "Remove workaround to remove FlaggedAPI in ump" into main am: dc7a325a55
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2850388
Change-Id: Ib4d438acb108e751de7d29ca8372e0783a00796d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Motomu Utsumi
authored and
Automerger Merge Worker
commited 2023-12-06 02:15:03 +00:00
40187a830a
Increase the LISTEN_ACTIVITY_TIMEOUT_MS timer
...
The test reuqires WiFi becomes the default network. But in
some bad networks, the probing time may take more than the
existing timer(5s). Increase it to 30s to prevent flakes
causing by bad network.
Fix: 313372234
Test: atest CtsNetTestCases
Change-Id: Ie0d2f014d2551826596d4a0e28448ba129f5e9eb
Chiachang Wang
commited 2023-12-06 01:47:32 +00:00
89f8fa60f2
Merge "Remove workaround to remove FlaggedAPI in ump" into main
Motomu Utsumi
authored and
Gerrit Code Review
commited 2023-12-06 01:17:43 +00:00
dc7a325a55
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib1c23a40d07f8a42d59aa691ee4faabcec7a19b5
Bill Yi
commited 2023-12-05 15:41:04 -08:00
b52d1d9c79
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 "Resolve the udc-extended-api diff from aosp" into udc-mainline-prod
Motomu Utsumi
authored and
Android (Google) Code Review
commited 2023-12-05 11:03:03 +00:00
2522bc5fc7
Resolve the udc-extended-api diff from aosp
...
This CL is a preparation to remove udc-extended-api directory by
aosp/2850388
Test: TH
Ignore-AOSP-First: CL to remove the diff from aosp
Change-Id: Ice5fea4935d525267edfdc298c096f37d90a32f4
Motomu Utsumi
commited 2023-12-05 11:02:52 +00:00
2cac66629f
Merge "Add support for setsockoptBytes" into main am: 38795d6f89
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2854705
Change-Id: I1a916db56972aa565292e0560d9a94fc32c6ca5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Yang Sun
authored and
Automerger Merge Worker
commited 2023-12-05 08:16:28 +00:00
f8070a9de4
Merge "Add support for setsockoptBytes" into main
Yang Sun
authored and
Gerrit Code Review
commited 2023-12-05 07:35:02 +00:00
38795d6f89
[AF01] Move NetworkStatsCollection comparison code to NetworkStatsCollection
...
This is a no-op refactoring to move the ultility method to a
common place to be referenced outside NetworkStatsService
in later patches.
Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.net.NetworkStatsServiceTest
Bug: 313841499
Change-Id: Ib0ef40d87486bf3d8d5b3f97c77291a00c0378ac
Junyu Lai
commited 2023-12-05 07:30:56 +00:00
77f84a40d1
Merge "Rename getXXX to makeXXX in TetheringDependencies" into main am: ef41398c1f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2843656
Change-Id: Ibe6e5afaf2eb7567d0d8a097e9725073cfedd00e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Treehugger Robot
authored and
Automerger Merge Worker
commited 2023-12-05 07:10:28 +00:00
711ce847c9
Merge "Rename getXXX to makeXXX in TetheringDependencies" into main
Treehugger Robot
authored and
Gerrit Code Review
commited 2023-12-05 06:42:25 +00:00
ef41398c1f
Merge "Random select started prefix range" into main am: 78c0d088d7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2677979
Change-Id: I983196e37671bc42318509b0e086e2607c6e69f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Mark Chien
authored and
Automerger Merge Worker
commited 2023-12-05 06:04:22 +00:00
dc38f59118
Merge "Random select started prefix range" into main
Mark Chien
authored and
Gerrit Code Review
commited 2023-12-05 05:25:18 +00:00
78c0d088d7
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
Rename getXXX to makeXXX in TetheringDependencies
...
This fix the code review comment from aosp/2319853 that getXXX functions
should be renamed to makeXXX because it's actually creating the object.
Test: TH
Change-Id: Ife8e1cc3a90b835764a2dd9731388b05d8a5c964
Mark
authored and
Mark Chien
commited 2023-12-04 09:02:55 +00:00
b720d6d726
Remove workaround to remove FlaggedAPI in ump
...
Test: TH
Change-Id: Icd3c87a7da9b45e5341a1a2ead68f0a9809591bb
Motomu Utsumi
commited 2023-12-04 08:59:43 +00:00
88410c6fd6
Mark Chien
authored and
Automerger Merge Worker
commited 
Gerrit Code Review
commited 
Ken Chen
authored and
Nate Jiang
authored and
Chiachang Wang
authored and
Yan Yan
authored and
Treehugger Robot
authored and
Paul Hu
authored and
Motomu Utsumi
authored and
Bill Yi
authored and
Android (Google) Code Review
commited 
Xiao Ma
authored and
Junyu Lai
authored and
Yang Sun
authored and