Message	SHA1
Merge "Add APIs for discover/resolve on specific networks" am: d61719c422 am: 5baa9f74ca ... Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1944726 Change-Id: Iad6b5fab7501ec18dc3946194f1a26af5fd7b627 Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-02-04 12:54:02 +00:00	69ed144d84
Add APIs for discover/resolve on specific networks ... Test that NsdManager specifies the correct network when a service is discovered, and that services can be resolved on a specified network. Also test that service discovery can be started on a specific network. Bug: 190249673 Test: atest NsdManagerTest Change-Id: Ie8b551ce9e33e3adf35f75508f91bbd0df71f837 Remi NGUYEN VAN   commited 2022-02-03 16:05:02 +09:00	06bdcec9fa
Move IpSec APIs to Connectivity module ... Bug: 204153604 Test: TH Change-Id: If4afabdc65ed2ac3e918af1d4a03c4c9173c4a3c Aaron Huang   authored and   Lorenzo Colitti   commited 2022-02-03 09:47:54 +09:00	68ca373929
Add nearby to tethering apex ... Nearby will be merged together with the tethering/connectivity APEX, so that module maintenance efforts can be reduced, and the two codebases can evolve the interfaces that they expose to each other over time. Bug: 189355156 Test: m Ignore-AOSP-First: Nearby is not yet in AOSP. This introduces minimal unavoidable merge conflicts until it is merged there. Change-Id: If4b40689a257d2806f895cd2dded97fc699adc5f Remi NGUYEN VAN   commited 2022-01-26 18:03:22 +09:00	51935fc21e
Build framework-connectivity-tiramisu library ... - Move nsd APIs and build framework-connectivity-tiramisu library - Add nsd associated hidden apis - Build service-connectivity-tiramisu-pre-jarjar library for T+ services. - Move ConnectivityServiceInitialiizer to service-t directory to create S+ service instances which can avoid dependency on lower sdk library. Bug: 206893064 Test: atest FrameworksNetTests CtsNetTestCases Ignore-AOSP-First: Other commits has merged conflict. CTS-Coverage-Bug: 207804007 Change-Id: I9628716f5c38047ff4ea2346b27589077259c436 paulhu   commited 2021-12-16 16:08:18 +00:00	667e8fb176
Build framework-connectivity-tiramisu library ... - Move nsd APIs and build framework-connectivity-tiramisu library - Add nsd associated hidden apis - Build service-connectivity-tiramisu-pre-jarjar library for T+ services. - Move ConnectivityServiceInitialiizer to service-t directory to create S+ service instances which can avoid dependency on lower sdk library. Bug: 206893064 Test: atest FrameworksNetTests CtsNetTestCases CTS-Coverage-Bug: 207804007 Merged-In: I9628716f5c38047ff4ea2346b27589077259c436 Change-Id: I9628716f5c38047ff4ea2346b27589077259c436 paulhu   commited 2021-12-17 00:04:24 +08:00	802ab9760f