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

Merge "Rename onResolveStopped to onResolutionStopped" am: e3e9f5622b

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

Change-Id: I64bfe1b7ee983a5cfc7f8b3515f68bf9a7f0c478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Paul Hu
2023-02-06 11:38:17 +00:00
committed by Automerger Merge Worker
parent d9360f4b26 e3e9f5622b
commit 7fde5f49e4
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -228,8 +228,8 @@ package android.net.nsd {
}
public static interface NsdManager.ResolveListener {
method public default void onResolutionStopped(@NonNull android.net.nsd.NsdServiceInfo);
method public void onResolveFailed(android.net.nsd.NsdServiceInfo, int);
method public default void onResolveStopped(@NonNull android.net.nsd.NsdServiceInfo);
method public void onServiceResolved(android.net.nsd.NsdServiceInfo);
method public default void onStopResolutionFailed(@NonNull android.net.nsd.NsdServiceInfo, int);
}

14
framework-t/src/android/net/nsd/NsdManager.java
View File

@@ -767,18 +767,18 @@ public final class NsdManager {
* Called on the internal thread or with an executor passed to
* {@link NsdManager#resolveService} to report the resolution was stopped.
*
* A stop resolution operation would call either onResolveStopped or onStopResolutionFailed
* once based on the result.
* A stop resolution operation would call either onResolutionStopped or
* onStopResolutionFailed once based on the result.
*/
default void onResolveStopped(@NonNull NsdServiceInfo serviceInfo) { }
default void onResolutionStopped(@NonNull NsdServiceInfo serviceInfo) { }
/**
* Called once on the internal thread or with an executor passed to
* {@link NsdManager#resolveService} to report that stopping resolution failed with an
* error.
*
* A stop resolution operation would call either onResolveStopped or onStopResolutionFailed
* once based on the result.
* A stop resolution operation would call either onResolutionStopped or
* onStopResolutionFailed once based on the result.
*/
default void onStopResolutionFailed(@NonNull NsdServiceInfo serviceInfo,
@StopOperationFailureCode int errorCode) { }
@@ -929,7 +929,7 @@ public final class NsdManager {
break;
case STOP_RESOLUTION_SUCCEEDED:
removeListener(key);
executor.execute(() -> ((ResolveListener) listener).onResolveStopped(
executor.execute(() -> ((ResolveListener) listener).onResolutionStopped(
ns));
break;
case REGISTER_SERVICE_CALLBACK_FAILED:
@@ -1301,7 +1301,7 @@ public final class NsdManager {
/**
* Stop service resolution initiated with {@link #resolveService}.
*
* A successful stop is notified with a call to {@link ResolveListener#onResolveStopped}.
* A successful stop is notified with a call to {@link ResolveListener#onResolutionStopped}.
*
* <p> Upon failure to stop service resolution for example if resolution is done or the
* requester stops resolution repeatedly, the application is notified

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

@@ -41,7 +41,7 @@ import android.net.cts.NsdManagerTest.NsdRegistrationRecord.RegistrationEvent.Se
import android.net.cts.NsdManagerTest.NsdRegistrationRecord.RegistrationEvent.ServiceUnregistered
import android.net.cts.NsdManagerTest.NsdRegistrationRecord.RegistrationEvent.UnregistrationFailed
import android.net.cts.NsdManagerTest.NsdResolveRecord.ResolveEvent.ResolveFailed
import android.net.cts.NsdManagerTest.NsdResolveRecord.ResolveEvent.ResolveStopped
import android.net.cts.NsdManagerTest.NsdResolveRecord.ResolveEvent.ResolutionStopped
import android.net.cts.NsdManagerTest.NsdResolveRecord.ResolveEvent.ServiceResolved
import android.net.cts.NsdManagerTest.NsdResolveRecord.ResolveEvent.StopResolutionFailed
import android.net.cts.NsdManagerTest.NsdServiceInfoCallbackRecord.ServiceInfoCallbackEvent.RegisterCallbackFailed
@@ -273,7 +273,7 @@ class NsdManagerTest {
ResolveEvent()
data class ServiceResolved(val serviceInfo: NsdServiceInfo) : ResolveEvent()
data class ResolveStopped(val serviceInfo: NsdServiceInfo) : ResolveEvent()
data class ResolutionStopped(val serviceInfo: NsdServiceInfo) : ResolveEvent()
data class StopResolutionFailed(val serviceInfo: NsdServiceInfo, val errorCode: Int) :
ResolveEvent()
}
@@ -286,8 +286,8 @@ class NsdManagerTest {
add(ServiceResolved(si))
}
override fun onResolveStopped(si: NsdServiceInfo) {
add(ResolveStopped(si))
override fun onResolutionStopped(si: NsdServiceInfo) {
add(ResolutionStopped(si))
}
override fun onStopResolutionFailed(si: NsdServiceInfo, err: Int) {
@@ -798,10 +798,10 @@ class NsdManagerTest {
val resolveRecord = NsdResolveRecord()
// Try to resolve an unknown service then stop it immediately.
// Expected ResolveStopped callback.
// Expected ResolutionStopped callback.
nsdShim.resolveService(nsdManager, si, { it.run() }, resolveRecord)
nsdShim.stopServiceResolution(nsdManager, resolveRecord)
val stoppedCb = resolveRecord.expectCallback<ResolveStopped>()
val stoppedCb = resolveRecord.expectCallback<ResolutionStopped>()
assertEquals(si.serviceName, stoppedCb.serviceInfo.serviceName)
assertEquals(si.serviceType, stoppedCb.serviceInfo.serviceType)
}

4
tests/unit/java/com/android/server/NsdServiceTest.java
View File

@@ -629,7 +629,7 @@ public class NsdServiceTest {
waitForIdle();
verify(mMockMDnsM).stopOperation(resolveId);
verify(resolveListener, timeout(TIMEOUT_MS)).onResolveStopped(argThat(ns ->
verify(resolveListener, timeout(TIMEOUT_MS)).onResolutionStopped(argThat(ns ->
request.getServiceName().equals(ns.getServiceName())
&& request.getServiceType().equals(ns.getServiceType())));
}
@@ -696,7 +696,7 @@ public class NsdServiceTest {
waitForIdle();
verify(mMockMDnsM).stopOperation(getAddrId);
verify(resolveListener, timeout(TIMEOUT_MS)).onResolveStopped(argThat(ns ->
verify(resolveListener, timeout(TIMEOUT_MS)).onResolutionStopped(argThat(ns ->
request.getServiceName().equals(ns.getServiceName())
&& request.getServiceType().equals(ns.getServiceType())));
}