Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81deef84 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Lorenzo Colitti
Browse files

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

Fixes: 28530428

(cherry picked from commit 7d5da4b0)

(cherry picked from commit 29154b00)

Change-Id: Ib8f8da947af804c8b203928e57ed6a8aedbf0684
parent 27089aad

core/java/android/net/nsd/NsdManager.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -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

core/java/android/net/nsd/NsdServiceInfo.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -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}.