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

DO NOT MERGE: Indicate the NsdServiceInfo attributes are only filled in for a resolved service.

Browse Source 
Fixes: 28530428

(cherry picked from commit 79a3c031a0)

(cherry picked from commit 2838d9bb56)

Change-Id: Ib8f8da947af804c8b203928e57ed6a8aedbf0684
This commit is contained in:
Philip P. Moltmann
2016-04-18 16:23:06 -07:00
committed by Lorenzo Colitti
parent c1c6b379c4
commit 8ad38f0f6c
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/net/nsd/NsdManager.java
View File

@@ -103,11 +103,11 @@ import com.android.internal.util.Protocol;
* to {@link DiscoveryListener#onServiceFound} and a service lost is notified on * to {@link DiscoveryListener#onServiceFound} and a service lost is notified on
* {@link DiscoveryListener#onServiceLost}. * {@link DiscoveryListener#onServiceLost}.
* *
* <p> Once the peer application discovers the "Example" http srevice, and needs to receive data * <p> Once the peer application discovers the "Example" http service, and either needs to read the
* from the "Example" application, it can initiate a resolve with {@link #resolveService} to * attributes of the service or wants to receive data from the "Example" application, it can
* resolve the host and port details for the purpose of establishing a connection. A successful * initiate a resolve with {@link #resolveService} to resolve the attributes, host, and port
* resolve is notified on {@link ResolveListener#onServiceResolved} and a failure is notified * details. A successful resolve is notified on {@link ResolveListener#onServiceResolved} and a
* on {@link ResolveListener#onResolveFailed}. * failure is notified on {@link ResolveListener#onResolveFailed}.
* *
* Applications can reserve for a service type at * Applications can reserve for a service type at
* http://www.iana.org/form/ports-service. Existing services can be found at * http://www.iana.org/form/ports-service. Existing services can be found at

3
core/java/android/net/nsd/NsdServiceInfo.java
View File

@@ -250,7 +250,8 @@ public final class NsdServiceInfo implements Parcelable {
} }
/** /**
* Retrive attributes as a map of String keys to byte[] values. * Retrieve attributes as a map of String keys to byte[] values. The attributes map is only
* valid for a resolved service.
* *
* <p> The returned map is unmodifiable; changes must be made through {@link #setAttribute} and * <p> The returned map is unmodifiable; changes must be made through {@link #setAttribute} and
* {@link #removeAttribute}. * {@link #removeAttribute}.