Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[NAN] Fix javadoc links"

Browse Source 
am: 4ad6291b08

Change-Id: Ie9d5b4826636488cfa6f41997443a08537895cdc
This commit is contained in:
Etan Cohen
2016-09-26 23:02:29 +00:00
committed by android-build-merger
parent e452d1e317 4ad6291b08
commit 2cd4514323
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wifi/java/android/net/wifi/nan/PublishConfig.java
View File

@@ -32,7 +32,8 @@ import java.util.Arrays;
/** /**
* Defines the configuration of a NAN publish session. Built using * Defines the configuration of a NAN publish session. Built using
* {@link PublishConfig.Builder}. A publish session is created 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)}. * {@link WifiNanPublishDiscoverySession#updatePublish(PublishConfig)}.
* *
* @hide PROPOSED_NAN_API * @hide PROPOSED_NAN_API

5
wifi/java/android/net/wifi/nan/SubscribeConfig.java
View File

@@ -32,7 +32,8 @@ import java.util.Arrays;
/** /**
* Defines the configuration of a NAN subscribe session. Built using * Defines the configuration of a NAN subscribe session. Built using
* {@link SubscribeConfig.Builder}. Subscribe is done 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)}. * {@link WifiNanSubscribeDiscoverySession#updateSubscribe(SubscribeConfig)}.
* *
* @hide PROPOSED_NAN_API * @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 * Sets the match style of the subscription - how are matches from a
* single match session (corresponding to the same publish action on the * single match session (corresponding to the same publish action on the
* peer) reported to the host (using 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 * ). The options are: only report the first match and ignore the rest
* {@link SubscribeConfig#MATCH_STYLE_FIRST_ONLY} or report every single * {@link SubscribeConfig#MATCH_STYLE_FIRST_ONLY} or report every single
* match {@link SubscribeConfig#MATCH_STYLE_ALL} (the default). * match {@link SubscribeConfig#MATCH_STYLE_ALL} (the default).

2
wifi/java/android/net/wifi/nan/WifiNanDiscoveryBaseSession.java
View File

@@ -34,7 +34,7 @@ import java.lang.ref.WeakReference;
* <li>Sending messages: {@link #sendMessage(Object, int, byte[])} or * <li>Sending messages: {@link #sendMessage(Object, int, byte[])} or
* {@link #sendMessage(Object, int, byte[], int)} methods. * {@link #sendMessage(Object, int, byte[], int)} methods.
* <li>Creating a network-specifier when requesting a NAN connection: * <li>Creating a network-specifier when requesting a NAN connection:
* {@link #createNetworkSpecifier(int, int, byte[])}. * {@link #createNetworkSpecifier(int, Object, byte[])}.
* </ul> * </ul>
* The {@link #destroy()} method must be called to destroy discovery sessions once they are * The {@link #destroy()} method must be called to destroy discovery sessions once they are
* no longer needed. * no longer needed.