Remove workaround to remove FlaggedAPI in ump
...
Test: TH
Merged-In: Ib69d2fdc1d73b36a08a3d8ae1f2c45b2bcffae64
Change-Id: I88c993680976d2e10d672bfdbf45119f2db13868
Motomu Utsumi
commited 2023-11-29 11:58:10 +09:00
da8fac1edb
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
Relax testValidation pass condition
...
The issue arises when the network becomes validated based on the
isCaptivePortal success with HTTPS, even though the HTTP probe
hasn't been executed yet. Given that there is no way to ensure
HTTP probe was sent in this case, the pass condition should be
relaxed, allowing a single https query instead of expecting both.
Test: atest FrameworksNetIntegrationTests:ConnectivityServiceIntegrationTest#testValidation \
--rerun-until-failure 100
(With hardcoded sleep when starting HTTP probe)
Fix: 303351630
Change-Id: I580e9a3a868cd0b3395a20ace27b006529475312
Junyu Lai
commited 2023-11-23 07:23:08 +00:00
9273ae0fd0
Merge "Remove unused aconfig" into main am: e01fc685a2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2845493
Change-Id: I964a2c6add6097124d8e79844421092b22654403
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Paul Hu
authored and
Automerger Merge Worker
commited 2023-11-23 06:46:49 +00:00
518064033d
Merge "Refactor RouterAdvertisementDaemon to build new RA in HandlerThread" into main am: 29f70feb01
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2490882
Change-Id: I2ea917338d84447ac71c0baf6ea88f6ee925eeba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
KH Shi
authored and
Automerger Merge Worker
commited 2023-11-23 06:46:39 +00:00
5a5ef8310b
Merge "Refactor RouterAdvertisementDaemon with FdEventsReader" into main am: 093433c8b8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2493357
Change-Id: I84b6e9581e129af1d3b69241771dd5b2da982954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
KH Shi
authored and
Automerger Merge Worker
commited 2023-11-23 06:46:26 +00:00
0d13903ced
Merge "Remove unused aconfig" into main
Paul Hu
authored and
Gerrit Code Review
commited 2023-11-23 06:22:15 +00:00
e01fc685a2
Merge "Refactor RouterAdvertisementDaemon to build new RA in HandlerThread" into main
KH Shi
authored and
Gerrit Code Review
commited 2023-11-23 05:51:04 +00:00
29f70feb01
Merge "Refactor RouterAdvertisementDaemon with FdEventsReader" into main
KH Shi
authored and
Gerrit Code Review
commited 2023-11-23 05:50:11 +00:00
093433c8b8
Remove unused aconfig
...
Remove nsd_expired_services_removal aconfig, since it is no
longer used.
Bug: 312669635
Test: m
Change-Id: I9b21b6102ed9a8160be3d853d44d9b051997d09e
Paul Hu
commited 2023-11-23 02:37:03 +00:00
af9e181b28
Merge "Remove --show-annotation FlaggedApi from flagged-apis-droidstubs" into main am: d3d41ac7a4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2842795
Change-Id: I3ca4028fcc283f17b81c132416fd0a51360e7b0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Motomu Utsumi
authored and
Automerger Merge Worker
commited 2023-11-22 14:35:59 +00:00
ca7d626641
Merge "Remove --show-annotation FlaggedApi from flagged-apis-droidstubs" into main
Motomu Utsumi
authored and
Gerrit Code Review
commited 2023-11-22 14:22:04 +00:00
d3d41ac7a4
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
Remove --show-annotation FlaggedApi from flagged-apis-droidstubs
...
framework-connectivity-flagged-apis-droidstubs is used by
jarjar-rules-generator to avoid jarjaring flagged apis.
But, this usage of --show-annotation FlaggedApi in the flag is not
supported.
So this CL removes --show-annotation FlaggedApi.
As far as framework-connectivity-flagged-apis-droidstubs contains
flagged APIs, it's fine that this droidstubs also contains non-flagged
APIs.
Test: TH
Bug: 312408311
Change-Id: I2f1f5624d98873420c0c36ac6e31386102211045
Motomu Utsumi
commited 2023-11-22 19:05:48 +09:00
ba5dde84f1
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
Refactor RouterAdvertisementDaemon to build new RA in HandlerThread
...
HandlerThread was introduced in aosp/2493357. This patch moves the
code originally located in buildNewRa() into the HandlerThread.
Bug: 246928127
Test: atest TetheringPrivilegedTests TetheringIntegrationTests \
TetheringTests
Change-Id: I5f6df0a3a79d7f4a865cfec7f88bc28816b1db95
KH Shi
commited 2023-11-22 07:25:16 +00:00
23a2158c38
Refactor RouterAdvertisementDaemon with FdEventsReader
...
This patch changes the implementation of UnicastResponder in the
RouterAdvertisementDaemon with FdEventsReader. The change includes
replacing Thread with HandlerThread, create socket in non-blocking
mode (required by FdEventsReader) and use FdEventsReader to listen
to the solicited RS packets. Two commands (CMD_START & CMD_STOP)
were added to control the lifecycle of the FdEventsReader.
Bug: 246928127
Test: atest TetheringPrivilegedTests TetheringIntegrationTests \
TetheringTests
Test: Enable WiFi hotspot and connected with another Pixel client:
1. Tcpdump on the Pixel client, checking the RA packets
2. Verify IPv6 addresses were configured
3. ping6 2001:4860:4860::64
Change-Id: I6e89903df90864e3bb34d498e353d6f87193e9d6
KH Shi
commited 2023-11-22 06:37:17 +00:00
bdcd7db9d8
Merge "Add Thread#join to guarantee the termination of the thread" into main am: 976e52a2c4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2840316
Change-Id: I2ee29b76f2cb1e1c7bd7b5cfd2afafe13df465fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Paul Hu
authored and
Automerger Merge Worker
commited 2023-11-22 06:26:31 +00:00
3fc8be92fb
Merge "Add Thread#join to guarantee the termination of the thread" into main
Paul Hu
authored and
Gerrit Code Review
commited 2023-11-22 06:22:23 +00:00
976e52a2c4
Merge "Reset the LISTEN_ACTIVITY_TIMEOUT_MS timer" into main am: eab653036d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2840696
Change-Id: Ia2b64271bae119abe30e6cec44a63b2c31f1de42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Chiachang Wang
authored and
Automerger Merge Worker
commited 2023-11-22 05:59:47 +00:00
31f25bd98d
Merge "Add feature flag for REGISTER_NSD_OFFLOAD_ENGINE permission" into main am: 482233a5be
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2829832
Change-Id: I1d0bf0cbc2098b6bbcdf7920a0de919bebcdfde6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Yuyang Huang
authored and
Automerger Merge Worker
commited 2023-11-22 05:59:34 +00:00
ebec64afe5
Merge "Reset the LISTEN_ACTIVITY_TIMEOUT_MS timer" into main
Chiachang Wang
authored and
Gerrit Code Review
commited 2023-11-22 05:49:32 +00:00
eab653036d
Merge "Add feature flag for REGISTER_NSD_OFFLOAD_ENGINE permission" into main
Yuyang Huang
authored and
Gerrit Code Review
commited 2023-11-22 05:48:11 +00:00
482233a5be
Merge "[Thread] clear calling identity before invoking app-supplied callback" into main am: e903b81709
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2825973
Change-Id: I757bbdc99484ee7f84b1a2c92433923f70e6224d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Kangping Dong
authored and
Automerger Merge Worker
commited 2023-11-22 03:57:45 +00:00
af4b9ececd
Merge "[Thread] clear calling identity before invoking app-supplied callback" into main
Kangping Dong
authored and
Gerrit Code Review
commited 2023-11-22 03:44:23 +00:00
e903b81709
Merge "Clean up BpfCoordinatorTest" into main am: be2750fc3f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2836500
Change-Id: I27055fac2e685119818f2ff25cb8f7c273d109dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
KH Shi
authored and
Automerger Merge Worker
commited 2023-11-22 03:43:12 +00:00
3d80525541
Merge "Clean up BpfCoordinatorTest" into main
KH Shi
authored and
Gerrit Code Review
commited 2023-11-22 03:35:42 +00:00
be2750fc3f
Merge "SyncSM11.1 make some functions inline" into main am: f1c04ca91f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2752407
Change-Id: Idf198f69c9f4c2681624f0cc7ef669347d6b3106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Mark Chien
authored and
Automerger Merge Worker
commited 2023-11-22 03:29:58 +00:00
f23ac3a580
Merge "SyncSM11.1 make some functions inline" into main
Mark Chien
authored and
Gerrit Code Review
commited 2023-11-22 03:03:22 +00:00
f1c04ca91f
Merge "Fix the memory leak in nsd tests" into main am: 005fb887e6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2814218
Change-Id: I444dfbd7828ab2815f6012c703bf5c8b1f205a5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Paul Hu
authored and
Automerger Merge Worker
commited 2023-11-22 03:03:00 +00:00
23e7336673
Merge "Fix the memory leak in nsd tests" into main
Paul Hu
authored and
Gerrit Code Review
commited 2023-11-22 02:57:24 +00:00
005fb887e6
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
[Thread] clear calling identity before invoking app-supplied callback
...
Per API council feedback and API guideline at
go/android-api-guidelines#provide-executor, it should call
Binder.clearCallingIdentity() before invoking the app-supplied callbacks
so that the app doesn't use the system-server's identity for permission
check in the callback.
Bug: 309952666
Test: atest ThreadNetworkUnitTests
Change-Id: I3cfbce29c0a516506bb76a44b151a583c8477806
Kangping Dong
commited 2023-11-22 01:54:34 +00:00
98015f3373
Reset the LISTEN_ACTIVITY_TIMEOUT_MS timer
...
This is a clean up commit to address TODO for resetting the
LISTEN_ACTIVITY_TIMEOUT_MS timer as aosp/2188755 was shipped.
Fix: 252972908
Test: atest CtsNetTestCases
Change-Id: Ibc1a1c68883a3772729f24b01f9dc8d3cc37c1eb
Chiachang Wang
commited 2023-11-22 01:52:55 +00:00
67f19ea60a
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
Merge "SyncSM09: Add Callback to UpstreamNetworkMonitor" into main am: 309365558c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2319853
Change-Id: Ice20c9ab2f8f6a7e4ae7af9a1666a9186d427f02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Mark Chien
authored and
Automerger Merge Worker
commited 2023-11-21 18:02:40 +00:00
2ecb140867
Merge "SyncSM09: Add Callback to UpstreamNetworkMonitor" into main
Mark Chien
authored and
Gerrit Code Review
commited 2023-11-21 17:29:10 +00:00
309365558c
Merge "Update Andorid.bp to use DnsResolver v13" into main am: faa10d066b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2452966
Change-Id: I2eaa8eaab07a039160890da3a09b451404491cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Mike Yu
authored and
Automerger Merge Worker
commited 2023-11-21 12:37:56 +00:00
aa8b19e205
Merge "Update Andorid.bp to use DnsResolver v13" into main
Mike Yu
authored and
Gerrit Code Review
commited 2023-11-21 12:04:30 +00:00
faa10d066b
Revert "Prioritize non-slices over slices"
...
This reverts commit 14499f0119 .
Reason for revert: b/312408745
Change-Id: I8b03799fe6e0e256263240909ee7446c178bf508
Jean Chalard
authored and
Gerrit Code Review
commited 2023-11-21 10:25:14 +00:00
6121a7656c
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
Merge "Explicitly select mdns_aidl_interface-V1-java" into main am: e5c9138ead
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2836113
Change-Id: I8f52a0875064a3f00f1912a0869ae3fef148ee78
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:35 +00:00
8d96e4f538
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 "Explicitly select mdns_aidl_interface-V1-java" into main
Ken Chen
authored and
Gerrit Code Review
commited 2023-11-21 09:02:35 +00:00
e5c9138ead
Add Thread#join to guarantee the termination of the thread
...
Also add MonitorThreadLeak annotation to check thread leak.
Test: atest ConnectivityCoverageTests --test-filter mdns*
Change-Id: Ie47f30360e36784428173f6cc87a4a6b09826405
Paul Hu
commited 2023-11-21 16:08:41 +08:00
0788d8ee7e
SyncSM11.1 make some functions inline
...
This is no-op change.
Test: atest TetheringTests
Change-Id: Ia5c68c403bdaa981f35ecad8ffc3e034746dfdea
Mark
commited 2023-11-21 06:11:32 +00:00
2ca4b1d156