LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add executors to NsdManager" am: b58df4bf13

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2027043

Change-Id: I93294667e79684652dba065583e651148a8d0991
This commit is contained in:
Remi NGUYEN VAN
2022-03-22 08:46:00 +00:00
committed by Automerger Merge Worker
parent 177ffffd25 b58df4bf13
commit ef37e45e8a
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework-t/api/current.txt
View File

@@ -188,10 +188,12 @@ package android.net.nsd {
public final class NsdManager { public final class NsdManager {
method public void discoverServices(String, int, android.net.nsd.NsdManager.DiscoveryListener); method public void discoverServices(String, int, android.net.nsd.NsdManager.DiscoveryListener);
method public void discoverServices(@NonNull String, int, @Nullable android.net.Network, @NonNull android.net.nsd.NsdManager.DiscoveryListener); method public void discoverServices(@NonNull String, int, @Nullable android.net.Network, @NonNull java.util.concurrent.Executor, @NonNull android.net.nsd.NsdManager.DiscoveryListener);
method @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE) public void discoverServices(@NonNull String, int, @NonNull android.net.NetworkRequest, @NonNull android.net.nsd.NsdManager.DiscoveryListener); method @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE) public void discoverServices(@NonNull String, int, @NonNull android.net.NetworkRequest, @NonNull java.util.concurrent.Executor, @NonNull android.net.nsd.NsdManager.DiscoveryListener);
method public void registerService(android.net.nsd.NsdServiceInfo, int, android.net.nsd.NsdManager.RegistrationListener); method public void registerService(android.net.nsd.NsdServiceInfo, int, android.net.nsd.NsdManager.RegistrationListener);
method public void registerService(@NonNull android.net.nsd.NsdServiceInfo, int, @NonNull java.util.concurrent.Executor, @NonNull android.net.nsd.NsdManager.RegistrationListener);
method public void resolveService(android.net.nsd.NsdServiceInfo, android.net.nsd.NsdManager.ResolveListener); method public void resolveService(android.net.nsd.NsdServiceInfo, android.net.nsd.NsdManager.ResolveListener);
method public void resolveService(@NonNull android.net.nsd.NsdServiceInfo, @NonNull java.util.concurrent.Executor, @NonNull android.net.nsd.NsdManager.ResolveListener);
method public void stopServiceDiscovery(android.net.nsd.NsdManager.DiscoveryListener); method public void stopServiceDiscovery(android.net.nsd.NsdManager.DiscoveryListener);
method public void unregisterService(android.net.nsd.NsdManager.RegistrationListener); method public void unregisterService(android.net.nsd.NsdManager.RegistrationListener);
field public static final String ACTION_NSD_STATE_CHANGED = "android.net.nsd.STATE_CHANGED"; field public static final String ACTION_NSD_STATE_CHANGED = "android.net.nsd.STATE_CHANGED";

28
tests/cts/net/src/android/net/cts/NsdManagerTest.kt
View File

@@ -71,6 +71,7 @@ import org.junit.runner.RunWith
import java.net.ServerSocket import java.net.ServerSocket
import java.nio.charset.StandardCharsets import java.nio.charset.StandardCharsets
import java.util.Random import java.util.Random
import java.util.concurrent.Executor
import kotlin.test.assertEquals import kotlin.test.assertEquals
import kotlin.test.assertFailsWith import kotlin.test.assertFailsWith
import kotlin.test.assertNotNull import kotlin.test.assertNotNull
@@ -342,9 +343,12 @@ class NsdManagerTest {
if (DBG) Log.d(TAG, "Port = $localPort") if (DBG) Log.d(TAG, "Port = $localPort")
val registrationRecord = NsdRegistrationRecord() val registrationRecord = NsdRegistrationRecord()
val registeredInfo = registerService(registrationRecord, si) // Test registering without an Executor
nsdManager.registerService(si, NsdManager.PROTOCOL_DNS_SD, registrationRecord)
val registeredInfo = registrationRecord.expectCallback<ServiceRegistered>().serviceInfo
val discoveryRecord = NsdDiscoveryRecord() val discoveryRecord = NsdDiscoveryRecord()
// Test discovering without an Executor
nsdManager.discoverServices(SERVICE_TYPE, NsdManager.PROTOCOL_DNS_SD, discoveryRecord) nsdManager.discoverServices(SERVICE_TYPE, NsdManager.PROTOCOL_DNS_SD, discoveryRecord)
// Expect discovery started // Expect discovery started
@@ -353,7 +357,10 @@ class NsdManagerTest {
// Expect a service record to be discovered // Expect a service record to be discovered
val foundInfo = discoveryRecord.waitForServiceDiscovered(registeredInfo.serviceName) val foundInfo = discoveryRecord.waitForServiceDiscovered(registeredInfo.serviceName)
val resolvedService = resolveService(foundInfo) // Test resolving without an Executor
val resolveRecord = NsdResolveRecord()
nsdManager.resolveService(foundInfo, resolveRecord)
val resolvedService = resolveRecord.expectCallback<ServiceResolved>().serviceInfo
// Check Txt attributes // Check Txt attributes
assertEquals(8, resolvedService.attributes.size) assertEquals(8, resolvedService.attributes.size)
@@ -408,7 +415,7 @@ class NsdManagerTest {
@Test @Test
fun testNsdManager_DiscoverOnNetwork() { fun testNsdManager_DiscoverOnNetwork() {
// This tests requires shims supporting T+ APIs (discovering on specific network) // This test requires shims supporting T+ APIs (discovering on specific network)
assumeTrue(ConstantsShim.VERSION > SC_V2) assumeTrue(ConstantsShim.VERSION > SC_V2)
val si = NsdServiceInfo() val si = NsdServiceInfo()
@@ -422,7 +429,7 @@ class NsdManagerTest {
tryTest { tryTest {
val discoveryRecord = NsdDiscoveryRecord() val discoveryRecord = NsdDiscoveryRecord()
nsdShim.discoverServices(nsdManager, SERVICE_TYPE, NsdManager.PROTOCOL_DNS_SD, nsdShim.discoverServices(nsdManager, SERVICE_TYPE, NsdManager.PROTOCOL_DNS_SD,
testNetwork1.network, discoveryRecord) testNetwork1.network, Executor { it.run() }, discoveryRecord)
val foundInfo = discoveryRecord.waitForServiceDiscovered( val foundInfo = discoveryRecord.waitForServiceDiscovered(
serviceName, testNetwork1.network) serviceName, testNetwork1.network)
@@ -442,7 +449,7 @@ class NsdManagerTest {
@Test @Test
fun testNsdManager_DiscoverWithNetworkRequest() { fun testNsdManager_DiscoverWithNetworkRequest() {
// This tests requires shims supporting T+ APIs (discovering on network request) // This test requires shims supporting T+ APIs (discovering on network request)
assumeTrue(ConstantsShim.VERSION > SC_V2) assumeTrue(ConstantsShim.VERSION > SC_V2)
val si = NsdServiceInfo() val si = NsdServiceInfo()
@@ -462,7 +469,7 @@ class NsdManagerTest {
.addTransportType(TRANSPORT_TEST) .addTransportType(TRANSPORT_TEST)
.setNetworkSpecifier(specifier) .setNetworkSpecifier(specifier)
.build(), .build(),
discoveryRecord) Executor { it.run() }, discoveryRecord)
val discoveryStarted = discoveryRecord.expectCallback<DiscoveryStarted>() val discoveryStarted = discoveryRecord.expectCallback<DiscoveryStarted>()
assertEquals(SERVICE_TYPE, discoveryStarted.serviceType) assertEquals(SERVICE_TYPE, discoveryStarted.serviceType)
@@ -507,7 +514,7 @@ class NsdManagerTest {
@Test @Test
fun testNsdManager_ResolveOnNetwork() { fun testNsdManager_ResolveOnNetwork() {
// This tests requires shims supporting T+ APIs (NsdServiceInfo.network) // This test requires shims supporting T+ APIs (NsdServiceInfo.network)
assumeTrue(ConstantsShim.VERSION > SC_V2) assumeTrue(ConstantsShim.VERSION > SC_V2)
val si = NsdServiceInfo() val si = NsdServiceInfo()
@@ -532,7 +539,7 @@ class NsdManagerTest {
serviceName, testNetwork2.network) serviceName, testNetwork2.network)
assertEquals(testNetwork2.network, nsdShim.getNetwork(foundInfo2)) assertEquals(testNetwork2.network, nsdShim.getNetwork(foundInfo2))
nsdManager.resolveService(foundInfo1, resolveRecord) nsdShim.resolveService(nsdManager, foundInfo1, Executor { it.run() }, resolveRecord)
val cb = resolveRecord.expectCallback<ServiceResolved>() val cb = resolveRecord.expectCallback<ServiceResolved>()
cb.serviceInfo.let { cb.serviceInfo.let {
// Resolved service type has leading dot // Resolved service type has leading dot
@@ -553,7 +560,8 @@ class NsdManagerTest {
* Register a service and return its registration record. * Register a service and return its registration record.
*/ */
private fun registerService(record: NsdRegistrationRecord, si: NsdServiceInfo): NsdServiceInfo { private fun registerService(record: NsdRegistrationRecord, si: NsdServiceInfo): NsdServiceInfo {
nsdManager.registerService(si, NsdManager.PROTOCOL_DNS_SD, record) nsdShim.registerService(nsdManager, si, NsdManager.PROTOCOL_DNS_SD, Executor { it.run() },
record)
// We may not always get the name that we tried to register; // We may not always get the name that we tried to register;
// This events tells us the name that was registered. // This events tells us the name that was registered.
val cb = record.expectCallback<ServiceRegistered>() val cb = record.expectCallback<ServiceRegistered>()
@@ -562,7 +570,7 @@ class NsdManagerTest {
private fun resolveService(discoveredInfo: NsdServiceInfo): NsdServiceInfo { private fun resolveService(discoveredInfo: NsdServiceInfo): NsdServiceInfo {
val record = NsdResolveRecord() val record = NsdResolveRecord()
nsdManager.resolveService(discoveredInfo, record) nsdShim.resolveService(nsdManager, discoveredInfo, Executor { it.run() }, record)
val resolvedCb = record.expectCallback<ServiceResolved>() val resolvedCb = record.expectCallback<ServiceResolved>()
assertEquals(discoveredInfo.serviceName, resolvedCb.serviceInfo.serviceName) assertEquals(discoveredInfo.serviceName, resolvedCb.serviceInfo.serviceName)