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

Commit 5706a8f5 authored by Etan Cohen's avatar Etan Cohen Committed by Gerrit Code Review
Browse files

Merge "[NAN] Rename to make discovery explicit"

parents 3c70a2fa 3855370c

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ LOCAL_SRC_FILES += \ 
	wifi/java/android/net/wifi/IWifiManager.aidl \

	wifi/java/android/net/wifi/nan/IWifiNanEventCallback.aidl \

	wifi/java/android/net/wifi/nan/IWifiNanManager.aidl \

	wifi/java/android/net/wifi/nan/IWifiNanSessionCallback.aidl \

	wifi/java/android/net/wifi/nan/IWifiNanDiscoverySessionCallback.aidl \

	wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \

	wifi/java/android/net/wifi/IWifiScanner.aidl \

	wifi/java/android/net/wifi/IRttManager.aidl \

wifi/java/android/net/wifi/nan/IWifiNanSessionCallback.aidl→wifi/java/android/net/wifi/nan/IWifiNanDiscoverySessionCallback.aidl

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ package android.net.wifi.nan; 
 *

 * {@hide}

 */

oneway interface IWifiNanSessionCallback

oneway interface IWifiNanDiscoverySessionCallback

{

    void onSessionStarted(int sessionId);

    void onSessionConfigSuccess();

wifi/java/android/net/wifi/nan/IWifiNanManager.aidl

+4 −3
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package android.net.wifi.nan; 
import android.app.PendingIntent;



import android.net.wifi.nan.ConfigRequest;

import android.net.wifi.nan.IWifiNanDiscoverySessionCallback;

import android.net.wifi.nan.IWifiNanEventCallback;

import android.net.wifi.nan.IWifiNanSessionCallback;

import android.net.wifi.nan.PublishConfig;

import android.net.wifi.nan.SubscribeConfig;

import android.net.wifi.RttManager;
@@ -42,9 +42,10 @@ interface IWifiNanManager 
            in ConfigRequest configRequest);

    void disconnect(int clientId, in IBinder binder);



    void publish(int clientId, in PublishConfig publishConfig, in IWifiNanSessionCallback callback);

    void publish(int clientId, in PublishConfig publishConfig,

            in IWifiNanDiscoverySessionCallback callback);

    void subscribe(int clientId, in SubscribeConfig subscribeConfig,

            in IWifiNanSessionCallback callback);

            in IWifiNanDiscoverySessionCallback callback);



    // session API

    void updatePublish(int clientId, int sessionId, in PublishConfig publishConfig);

wifi/java/android/net/wifi/nan/PublishConfig.java

+11 −9
Original line number Diff line number Diff line
@@ -32,8 +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 WifiNanManager#publish(PublishConfig, WifiNanSessionCallback)} or updated using

 * {@link WifiNanPublishSession#updatePublish(PublishConfig)}.

 * {@link WifiNanManager#publish(PublishConfig, WifiNanDiscoverySessionCallback)} or updated using

 * {@link WifiNanPublishDiscoverySession#updatePublish(PublishConfig)}.

 *

 * @hide PROPOSED_NAN_API

 */
@@ -318,12 +318,13 @@ public final class PublishConfig implements Parcelable { 
         * Sets the number of times an unsolicited (configured using

         * {@link PublishConfig.Builder#setPublishType(int)}) publish session

         * will be broadcast. When the count is reached an event will be

         * generated for {@link WifiNanSessionCallback#onSessionTerminated(int)}

         * with {@link WifiNanSessionCallback#TERMINATE_REASON_DONE} [unless

         * generated for {@link WifiNanDiscoverySessionCallback#onSessionTerminated(int)}

         * with {@link WifiNanDiscoverySessionCallback#TERMINATE_REASON_DONE} [unless

         * {@link #setEnableTerminateNotification(boolean)} disables the callback].

         * <p>

         *     Optional. 0 by default - indicating the session doesn't terminate on its own.

         *     Session will be terminated when {@link WifiNanSession#terminate()} is called.

         *     Session will be terminated when {@link WifiNanDiscoveryBaseSession#terminate()} is

         *     called.

         *

         * @param publishCount Number of publish packets to broadcast.

         *
@@ -343,12 +344,13 @@ public final class PublishConfig implements Parcelable { 
         * {@link PublishConfig.Builder#setPublishType(int)}) publish session

         * will be alive - broadcasting a packet. When the TTL is reached

         * an event will be generated for

         * {@link WifiNanSessionCallback#onSessionTerminated(int)} with

         * {@link WifiNanSessionCallback#TERMINATE_REASON_DONE}  [unless

         * {@link WifiNanDiscoverySessionCallback#onSessionTerminated(int)} with

         * {@link WifiNanDiscoverySessionCallback#TERMINATE_REASON_DONE}  [unless

         * {@link #setEnableTerminateNotification(boolean)} disables the callback].

         * <p>

         *     Optional. 0 by default - indicating the session doesn't terminate on its own.

         *     Session will be terminated when {@link WifiNanSession#terminate()} is called.

         *     Session will be terminated when {@link WifiNanDiscoveryBaseSession#terminate()} is

         *     called.

         *

         * @param ttlSec Lifetime of a publish session in seconds.

         *
@@ -365,7 +367,7 @@ public final class PublishConfig implements Parcelable { 


        /**

         * Configure whether a publish terminate notification

         * {@link WifiNanSessionCallback#onSessionTerminated(int)} is reported

         * {@link WifiNanDiscoverySessionCallback#onSessionTerminated(int)} is reported

         * back to the callback.

         *

         * @param enable If true the terminate callback will be called when the

wifi/java/android/net/wifi/nan/SubscribeConfig.java

+12 −10
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ import java.util.Arrays; 
/**

 * Defines the configuration of a NAN subscribe session. Built using

 * {@link SubscribeConfig.Builder}. Subscribe is done using

 * {@link WifiNanManager#subscribe(SubscribeConfig, WifiNanSessionCallback)} or

 * {@link WifiNanSubscribeSession#updateSubscribe(SubscribeConfig)}.

 * {@link WifiNanManager#subscribe(SubscribeConfig, WifiNanDiscoverySessionCallback)} or

 * {@link WifiNanSubscribeDiscoverySession#updateSubscribe(SubscribeConfig)}.

 *

 * @hide PROPOSED_NAN_API

 */
@@ -350,11 +350,12 @@ public final class SubscribeConfig implements Parcelable { 
         * Sets the number of times an active (

         * {@link SubscribeConfig.Builder#setSubscribeType(int)}) subscribe session

         * will broadcast. When the count is reached an event will be

         * generated for {@link WifiNanSessionCallback#onSessionTerminated(int)}

         * with {@link WifiNanSessionCallback#TERMINATE_REASON_DONE}.

         * generated for {@link WifiNanDiscoverySessionCallback#onSessionTerminated(int)}

         * with {@link WifiNanDiscoverySessionCallback#TERMINATE_REASON_DONE}.

         * <p>

         *     Optional. 0 by default - indicating the session doesn't terminate on its own.

         *     Session will be terminated when {@link WifiNanSession#terminate()} is called.

         *     Session will be terminated when {@link WifiNanDiscoveryBaseSession#terminate()} is

         *     called.

         *

         * @param subscribeCount Number of subscribe packets to broadcast.

         *
@@ -374,11 +375,12 @@ public final class SubscribeConfig implements Parcelable { 
         * {@link SubscribeConfig.Builder#setSubscribeType(int)}) subscribe session

         * will be alive - i.e. broadcasting a packet. When the TTL is reached

         * an event will be generated for

         * {@link WifiNanSessionCallback#onSessionTerminated(int)} with

         * {@link WifiNanSessionCallback#TERMINATE_REASON_DONE}.

         * {@link WifiNanDiscoverySessionCallback#onSessionTerminated(int)} with

         * {@link WifiNanDiscoverySessionCallback#TERMINATE_REASON_DONE}.

         * <p>

         *     Optional. 0 by default - indicating the session doesn't terminate on its own.

         *     Session will be terminated when {@link WifiNanSession#terminate()} is called.

         *     Session will be terminated when {@link WifiNanDiscoveryBaseSession#terminate()} is

         *     called.

         *

         * @param ttlSec Lifetime of a subscribe session in seconds.

         *
@@ -397,7 +399,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 WifiNanSessionCallback#onMatch(int, byte[], byte[])}

         * {@link WifiNanDiscoverySessionCallback#onMatch(int, 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).
@@ -417,7 +419,7 @@ public final class SubscribeConfig implements Parcelable { 


        /**

         * Configure whether a subscribe terminate notification

         * {@link WifiNanSessionCallback#onSessionTerminated(int)} is reported

         * {@link WifiNanDiscoverySessionCallback#onSessionTerminated(int)} is reported

         * back to the callback.

         *

         * @param enable If true the terminate callback will be called when the