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

Commit 2cd45143 authored by Etan Cohen's avatar Etan Cohen Committed by android-build-merger
Browse files

Merge "[NAN] Fix javadoc links"

am: 4ad6291b

Change-Id: Ie9d5b4826636488cfa6f41997443a08537895cdc
parents e452d1e3 4ad6291b
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ import java.util.Arrays;
/**
 * Defines the configuration of a NAN publish session. Built using
 * {@link PublishConfig.Builder}. A publish session is created using
 * {@link WifiNanSession#publish(PublishConfig, WifiNanDiscoverySessionCallback)} or updated using
 * {@link WifiNanSession#publish(android.os.Handler, PublishConfig, WifiNanDiscoverySessionCallback)}
 * or updated using
 * {@link WifiNanPublishDiscoverySession#updatePublish(PublishConfig)}.
 *
 * @hide PROPOSED_NAN_API
+3 −2
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ import java.util.Arrays;
/**
 * Defines the configuration of a NAN subscribe session. Built using
 * {@link SubscribeConfig.Builder}. Subscribe is done using
 * {@link WifiNanSession#subscribe(SubscribeConfig, WifiNanDiscoverySessionCallback)} or
 * {@link WifiNanSession#subscribe(android.os.Handler, SubscribeConfig, WifiNanDiscoverySessionCallback)}
 * or
 * {@link WifiNanSubscribeDiscoverySession#updateSubscribe(SubscribeConfig)}.
 *
 * @hide PROPOSED_NAN_API
@@ -399,7 +400,7 @@ public final class SubscribeConfig implements Parcelable {
         * Sets the match style of the subscription - how are matches from a
         * single match session (corresponding to the same publish action on the
         * peer) reported to the host (using the
         * {@link WifiNanDiscoverySessionCallback#onServiceDiscovered(int, byte[], byte[])}
         * {@link WifiNanDiscoverySessionCallback#onServiceDiscovered(Object, byte[], byte[])}
         * ). The options are: only report the first match and ignore the rest
         * {@link SubscribeConfig#MATCH_STYLE_FIRST_ONLY} or report every single
         * match {@link SubscribeConfig#MATCH_STYLE_ALL} (the default).
+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import java.lang.ref.WeakReference;
 *     <li>Sending messages: {@link #sendMessage(Object, int, byte[])} or
 *     {@link #sendMessage(Object, int, byte[], int)} methods.
 *     <li>Creating a network-specifier when requesting a NAN connection:
 *     {@link #createNetworkSpecifier(int, int, byte[])}.
 *     {@link #createNetworkSpecifier(int, Object, byte[])}.
 * </ul>
 * The {@link #destroy()} method must be called to destroy discovery sessions once they are
 * no longer needed.