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

Commit 65617f21 authored by Etan Cohen's avatar Etan Cohen Committed by android-build-merger
Browse files

Merge "[AWARE] Fix javadocs for match filter update" 

am: 7241d288

Change-Id: I67b2798b0eb1bc7e4ccd727aad9e761da49a8823
parents 8058dc0e 7241d288

wifi/java/android/net/wifi/aware/SubscribeConfig.java

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

         *

wifi/java/android/net/wifi/aware/WifiAwareCharacteristics.java

+2 −2
Original line number Diff line number Diff line
@@ -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<byte[]>)} and

     * {@link SubscribeConfig.Builder#setMatchFilter(java.util.List<byte[]>)}.

     * {@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.

     */

wifi/java/android/net/wifi/aware/WifiAwareDiscoveryBaseSession.java

+6 −6
Original line number Diff line number Diff line
@@ -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<byte[]>)} event.

     * byte[], java.util.List)} event.

     * <p>

     *     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<byte[]>)} 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<byte[]>)} event.

     * byte[], java.util.List)} event.

     * <p>

     *     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<byte[]>)} 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<byte[]>)} 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<byte[]>)} 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