From 7c724e67082230b41443bb119357b3f1920d548b Mon Sep 17 00:00:00 2001 From: Etan Cohen Date: Thu, 22 Sep 2016 12:37:17 -0700 Subject: [PATCH] [NAN] Fix javadoc links (cherry-pick of commit ee3d9fc5e60ce4b57dbba7483ac323ed29df2e4a) Bug: 31470256 Test: builds (javadoc only) Change-Id: I645525660b9a6759f968d9e62cd79d6a851815bf --- wifi/java/android/net/wifi/nan/PublishConfig.java | 3 ++- wifi/java/android/net/wifi/nan/SubscribeConfig.java | 5 +++-- .../android/net/wifi/nan/WifiNanDiscoveryBaseSession.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/wifi/java/android/net/wifi/nan/PublishConfig.java b/wifi/java/android/net/wifi/nan/PublishConfig.java index cfa2300572c94..5ffd54697e714 100644 --- a/wifi/java/android/net/wifi/nan/PublishConfig.java +++ b/wifi/java/android/net/wifi/nan/PublishConfig.java @@ -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 diff --git a/wifi/java/android/net/wifi/nan/SubscribeConfig.java b/wifi/java/android/net/wifi/nan/SubscribeConfig.java index 569c6b436eefd..28d5d914886fc 100644 --- a/wifi/java/android/net/wifi/nan/SubscribeConfig.java +++ b/wifi/java/android/net/wifi/nan/SubscribeConfig.java @@ -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). diff --git a/wifi/java/android/net/wifi/nan/WifiNanDiscoveryBaseSession.java b/wifi/java/android/net/wifi/nan/WifiNanDiscoveryBaseSession.java index b3722468afee8..5b84eb27dc844 100644 --- a/wifi/java/android/net/wifi/nan/WifiNanDiscoveryBaseSession.java +++ b/wifi/java/android/net/wifi/nan/WifiNanDiscoveryBaseSession.java @@ -34,7 +34,7 @@ import java.lang.ref.WeakReference; *
  • Sending messages: {@link #sendMessage(Object, int, byte[])} or * {@link #sendMessage(Object, int, byte[], int)} methods. *
  • Creating a network-specifier when requesting a NAN connection: - * {@link #createNetworkSpecifier(int, int, byte[])}. + * {@link #createNetworkSpecifier(int, Object, byte[])}. * * The {@link #destroy()} method must be called to destroy discovery sessions once they are * no longer needed.