From 0ae58fa665af12a3f060c3eecf5cb331a975880a Mon Sep 17 00:00:00 2001 From: Etan Cohen Date: Thu, 1 Dec 2016 16:59:41 -0800 Subject: [PATCH] [AWARE] Fix javadocs for match filter update Javadocs update. Specifically, cannot contain generics (since under-the-hood generics are just the undecorated class). Bug: 32840891 Test: generated docs (no functional change) Change-Id: I4bc2967a60ad27d137fd5a4dd3db18625343c910 --- .../java/android/net/wifi/aware/SubscribeConfig.java | 2 +- .../net/wifi/aware/WifiAwareCharacteristics.java | 4 ++-- .../wifi/aware/WifiAwareDiscoveryBaseSession.java | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/wifi/java/android/net/wifi/aware/SubscribeConfig.java b/wifi/java/android/net/wifi/aware/SubscribeConfig.java index bf35445ff88af..0fe69a81d218e 100644 --- a/wifi/java/android/net/wifi/aware/SubscribeConfig.java +++ b/wifi/java/android/net/wifi/aware/SubscribeConfig.java @@ -405,7 +405,7 @@ public final class SubscribeConfig implements Parcelable { * single match session (corresponding to the same publish action on the * peer) reported to the host (using the * {@link WifiAwareDiscoverySessionCallback#onServiceDiscovered(WifiAwareManager.PeerHandle, - * byte[], byte[])}). The options are: only report the first match and ignore the rest + * byte[], List)}). 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/aware/WifiAwareCharacteristics.java b/wifi/java/android/net/wifi/aware/WifiAwareCharacteristics.java index 95d128d8e5147..092aa341c9b35 100644 --- a/wifi/java/android/net/wifi/aware/WifiAwareCharacteristics.java +++ b/wifi/java/android/net/wifi/aware/WifiAwareCharacteristics.java @@ -70,8 +70,8 @@ public class WifiAwareCharacteristics implements Parcelable { /** * Returns the maximum length of byte array that can be used to specify a Aware match filter. * Restricts the parameters of the - * {@link PublishConfig.Builder#setMatchFilter(java.util.List)} and - * {@link SubscribeConfig.Builder#setMatchFilter(java.util.List)}. + * {@link PublishConfig.Builder#setMatchFilter(java.util.List)} and + * {@link SubscribeConfig.Builder#setMatchFilter(java.util.List)}. * * @return A positive integer, maximum legngth of byte array for Aware discovery match filter. */ diff --git a/wifi/java/android/net/wifi/aware/WifiAwareDiscoveryBaseSession.java b/wifi/java/android/net/wifi/aware/WifiAwareDiscoveryBaseSession.java index 451d8a594cc59..2812ad4f147d1 100644 --- a/wifi/java/android/net/wifi/aware/WifiAwareDiscoveryBaseSession.java +++ b/wifi/java/android/net/wifi/aware/WifiAwareDiscoveryBaseSession.java @@ -140,7 +140,7 @@ public class WifiAwareDiscoveryBaseSession { * Sends a message to the specified destination. Aware messages are transmitted in the context * of a discovery session - executed subsequent to a publish/subscribe * {@link WifiAwareDiscoverySessionCallback#onServiceDiscovered(WifiAwareManager.PeerHandle, - * byte[], java.util.List)} event. + * byte[], java.util.List)} event. *

* Aware messages are not guaranteed delivery. Callbacks on * {@link WifiAwareDiscoverySessionCallback} indicate message was transmitted successfully, @@ -154,7 +154,7 @@ public class WifiAwareDiscoveryBaseSession { * * @param peerHandle The peer's handle for the message. Must be a result of an * {@link WifiAwareDiscoverySessionCallback#onServiceDiscovered(WifiAwareManager.PeerHandle, - * byte[], java.util.List)} or + * byte[], java.util.List)} or * {@link WifiAwareDiscoverySessionCallback#onMessageReceived(WifiAwareManager.PeerHandle, * byte[])} events. * @param messageId An arbitrary integer used by the caller to identify the message. The same @@ -187,7 +187,7 @@ public class WifiAwareDiscoveryBaseSession { * Sends a message to the specified destination. Aware messages are transmitted in the context * of a discovery session - executed subsequent to a publish/subscribe * {@link WifiAwareDiscoverySessionCallback#onServiceDiscovered(WifiAwareManager.PeerHandle, - * byte[], java.util.List)} event. + * byte[], java.util.List)} event. *

* Aware messages are not guaranteed delivery. Callbacks on * {@link WifiAwareDiscoverySessionCallback} indicate message was transmitted successfully, @@ -203,7 +203,7 @@ public class WifiAwareDiscoveryBaseSession { * * @param peerHandle The peer's handle for the message. Must be a result of an * {@link WifiAwareDiscoverySessionCallback#onServiceDiscovered(WifiAwareManager.PeerHandle, - * byte[], java.util.List)} or + * byte[], java.util.List)} or * {@link WifiAwareDiscoverySessionCallback#onMessageReceived(WifiAwareManager.PeerHandle, * byte[])} events. * @param messageId An arbitrary integer used by the caller to identify the message. The same @@ -220,7 +220,7 @@ public class WifiAwareDiscoveryBaseSession { /** * Start a ranging operation with the specified peers. The peer IDs are obtained from an * {@link WifiAwareDiscoverySessionCallback#onServiceDiscovered(WifiAwareManager.PeerHandle, - * byte[], java.util.List)} or + * byte[], java.util.List)} or * {@link WifiAwareDiscoverySessionCallback#onMessageReceived(WifiAwareManager.PeerHandle, * byte[])} operation - can * only range devices which are part of an ongoing discovery session. @@ -266,7 +266,7 @@ public class WifiAwareDiscoveryBaseSession { * * @param peerHandle The peer's handle obtained through * {@link WifiAwareDiscoverySessionCallback#onServiceDiscovered(WifiAwareManager.PeerHandle, - * byte[], java.util.List)} or + * byte[], java.util.List)} or * {@link WifiAwareDiscoverySessionCallback#onMessageReceived(WifiAwareManager.PeerHandle, * byte[])}. On a RESPONDER this value is used to gate the acceptance of a connection request * from only that peer. A RESPONDER may specified a null - indicating that