Message	SHA1
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
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 "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
[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
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 "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
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
Add support for setsockoptBytes ... Test: atest FrameworksNetTests:android.net.connectivity.android.net.NetworkUtilsTest Change-Id: I3d94172fa8a42e2ab8ba4caf80d5caaa11fac703 Yang Sun   commited 2023-12-04 09:02:45 +08:00	f2987b8bf8
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
Merge "Revert^2 "Update NetworkAgent#register to compatible with old NetworkAgentTest"" into main am: dda4052e54 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2854710 Change-Id: I81d96743cdaaff28acbec3368a33260ddd777255 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Motomu Utsumi   authored and   Automerger Merge Worker   commited 2023-12-01 12:50:08 +00:00	58e4e95fc7
Merge "Revert^2 "Update NetworkAgent#register to compatible with old NetworkAgentTest"" into main Motomu Utsumi   authored and   Gerrit Code Review   commited 2023-12-01 12:24:04 +00:00	dda4052e54
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
Revert^2 "Update NetworkAgent#register to compatible with old NetworkAgentTest" ... This reverts commit db884c9a93. Reason for revert: reason of aosp/2849874 revert is solved by aosp/2854408 Change-Id: Ic5ffddf2f811c0d2c359f292c3b44b833bae5eaa Motomu Utsumi   authored and   Gerrit Code Review   commited 2023-12-01 06:31:19 +00:00	3c5891764c
Merge "Revert "Update NetworkAgent#register to compatible with old NetworkAgentTest"" into main am: 3139f9794c ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2855227 Change-Id: Iee77a07f654511eaf11c0b1fdc2f4587a8bce0a0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Nick Wille   authored and   Automerger Merge Worker   commited 2023-11-30 23:39:28 +00:00	39b701765d
Merge "Revert "Update NetworkAgent#register to compatible with old NetworkAgentTest"" into main Nick Wille   authored and   Gerrit Code Review   commited 2023-11-30 23:06:23 +00:00	3139f9794c
Revert "Update NetworkAgent#register to compatible with old NetworkAgentTest" ... This reverts commit 1e7c4a494d. This change is a suspect for causing test breakages, it may or may not be reverted. Bug: 314087796 Reason for revert: 314087796 Change-Id: If0a1c1e2d0e260319cf64b2d00828638abebb7fe Nick Wille   commited 2023-11-30 22:07:14 +00:00	db884c9a93
Revert canSeeAllowedUids for ownerUid ... aosp/2405720 allowed network owner uid to see allowed uids But this breaked old cts. This CL reverts the behavior for network owner uid. Bug: 312093253 Bug: 313025186 Bug: 312196228 Test: TH Change-Id: Iaa732d22f67ecce7678e68bb8b20cec526116dc9 Motomu Utsumi   commited 2023-12-01 00:45:14 +09:00	eb4a1968ef
Merge "Update NetworkAgent#register to compatible with old NetworkAgentTest" into main am: f73d80b61c ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2849874 Change-Id: I061fbb2a43ae390611671f493fc0e3dd5bc03b57 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Motomu Utsumi   authored and   Automerger Merge Worker   commited 2023-11-30 09:23:35 +00:00	893799e875
Merge "Update NetworkAgent#register to compatible with old NetworkAgentTest" into main Motomu Utsumi   authored and   Gerrit Code Review   commited 2023-11-30 08:59:50 +00:00	f73d80b61c
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
Update NetworkAgent#register to compatible with old NetworkAgentTest ... aosp/2792436 updated NetworkAgent and NetworkAgentTest. But the NetworkAgent change was not compatible with the old NetworkAgentTest. This CL makes NetworkAgent change to compatible with the old NetworkAgentTest. aosp/2851330 will update NetworkAgentTest to support NetworkAgent change done in aosp/2792436. Once the old cts is EOL, workaround in NetworkAgentTest and NetworkAgent can be removed. Bug: 310124646 Test: atest NetworkAgentTest Change-Id: Ic99b0ab72526a9ba22653f5bb132214ef0814440 Motomu Utsumi   commited 2023-11-30 06:19:40 +00:00	1e7c4a494d
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 "Ensure apps can't directly access the dnsresolver service." into main am: cae5396ccf ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2801613 Change-Id: I247ee0a415667954a13a5bed22502fe40f3fee4e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2023-11-27 15:41:32 +00:00	cd095c7e62
Merge "Ensure apps can't directly access the dnsresolver service." into main Lorenzo Colitti   authored and   Gerrit Code Review   commited 2023-11-27 15:12:06 +00:00	cae5396ccf
Merge "Disable LowPowerStandby by adding configuration" into main am: 312b3c14e6 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2825097 Change-Id: I5785de12773141f955ffe6dfdb0f226b431dd774 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sudheer Shanka   authored and   Automerger Merge Worker   commited 2023-11-27 08:36:06 +00:00	cfcc608583
Merge "Disable LowPowerStandby by adding configuration" into main Sudheer Shanka   authored and   Gerrit Code Review   commited 2023-11-27 07:58:40 +00:00	312b3c14e6
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
Merge "Prompt user to add data on mobile portals" into main Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2023-11-27 02:45:14 +00:00	5db2089717
Merge "Relax testValidation pass condition" into main am: cc2cfd252d ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2845494 Change-Id: I3c6452ea7f4eec93f176383e9f5c3a024bc4efcd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Treehugger Robot   authored and   Automerger Merge Worker   commited 2023-11-24 03:44:00 +00:00	4cc304e025
Merge "Relax testValidation pass condition" into main Treehugger Robot   authored and   Gerrit Code Review   commited 2023-11-24 03:31:29 +00:00	cc2cfd252d
Merge "Revert "Prioritize non-slices over slices"" into main am: 11162e97c6 ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2840317 Change-Id: I055769cfd04ff6e120cc9a3f99ad08a7ac91f547 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Jean Chalard   authored and   Automerger Merge Worker   commited 2023-11-24 03:26:47 +00:00	6454939961
Merge "Revert "Prioritize non-slices over slices"" into main Jean Chalard   authored and   Gerrit Code Review   commited 2023-11-24 02:50:35 +00:00	11162e97c6
Prompt user to add data on mobile portals ... On mobile networks it is more likely that the user needs to top up or get a mobile data subscription, rather than "sign in" as the previous messaging was suggesting. Following feedback from interaction designers / UX writers, change the strings to be more appropriate for the most common use-case. Bug: 153673376 Test: atest FrameworksNetTests manual test on mobile network force-detecting a portal. Change-Id: I5b4d4a17fd507d8cf3c9863cf23b5fedb258852e Remi NGUYEN VAN   commited 2023-11-24 11:02:19 +09:00	3f2ff2e3d7