Merge "[NAN] Method renames based on API council feedback" (3501748d) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/nan/ConfigRequest.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -23,7 +23,7 @@ import android.os.Parcelable;
	/**		/**
	* Defines a request object to configure a Wi-Fi NAN network. Built using		* Defines a request object to configure a Wi-Fi NAN network. Built using
	* {@link ConfigRequest.Builder}. Configuration is requested using		* {@link ConfigRequest.Builder}. Configuration is requested using
	* {@link WifiNanManager#connect(android.os.Handler, ConfigRequest, WifiNanEventCallback)}.		* {@link WifiNanManager#attach(android.os.Handler, WifiNanEventCallback)}.
	* Note that the actual achieved configuration may be different from the		* Note that the actual achieved configuration may be different from the
	* requested configuration - since different applications may request different		* requested configuration - since different applications may request different
	* configurations.		* configurations.

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

+3 −3

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

+4 −4

wifi/java/android/net/wifi/nan/WifiNanDiscoveryBaseSession.java

+23 −20

wifi/java/android/net/wifi/nan/WifiNanDiscoverySessionCallback.java

+20 −20

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,7 @@ 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 WifiNanManager#publish(PublishConfig, WifiNanDiscoverySessionCallback)} or updated using		* {@link WifiNanSession#publish(PublishConfig, WifiNanDiscoverySessionCallback)} or updated using
	* {@link WifiNanPublishDiscoverySession#updatePublish(PublishConfig)}.		* {@link WifiNanPublishDiscoverySession#updatePublish(PublishConfig)}.
	*		*
	* @hide PROPOSED_NAN_API		* @hide PROPOSED_NAN_API
	@@ -323,7 +323,7 @@ public final class PublishConfig implements Parcelable {
	* {@link #setEnableTerminateNotification(boolean)} disables the callback].		* {@link #setEnableTerminateNotification(boolean)} disables the callback].
	* <p>		* <p>
	* Optional. 0 by default - indicating the session doesn't terminate on its own.		* Optional. 0 by default - indicating the session doesn't terminate on its own.
	* Session will be terminated when {@link WifiNanDiscoveryBaseSession#terminate()} is		* Session will be terminated when {@link WifiNanDiscoveryBaseSession#destroy()} is
	* called.		* called.
	*		*
	* @param publishCount Number of publish packets to broadcast.		* @param publishCount Number of publish packets to broadcast.
	@@ -349,7 +349,7 @@ public final class PublishConfig implements Parcelable {
	* {@link #setEnableTerminateNotification(boolean)} disables the callback].		* {@link #setEnableTerminateNotification(boolean)} disables the callback].
	* <p>		* <p>
	* Optional. 0 by default - indicating the session doesn't terminate on its own.		* Optional. 0 by default - indicating the session doesn't terminate on its own.
	* Session will be terminated when {@link WifiNanDiscoveryBaseSession#terminate()} is		* Session will be terminated when {@link WifiNanDiscoveryBaseSession#destroy()} is
	* called.		* called.
	*		*
	* @param ttlSec Lifetime of a publish session in seconds.		* @param ttlSec Lifetime of a publish session in seconds.

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,7 @@ 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 WifiNanManager#subscribe(SubscribeConfig, WifiNanDiscoverySessionCallback)} or		* {@link WifiNanSession#subscribe(SubscribeConfig, WifiNanDiscoverySessionCallback)} or
	* {@link WifiNanSubscribeDiscoverySession#updateSubscribe(SubscribeConfig)}.		* {@link WifiNanSubscribeDiscoverySession#updateSubscribe(SubscribeConfig)}.
	*		*
	* @hide PROPOSED_NAN_API		* @hide PROPOSED_NAN_API
	@@ -354,7 +354,7 @@ public final class SubscribeConfig implements Parcelable {
	* with {@link WifiNanDiscoverySessionCallback#TERMINATE_REASON_DONE}.		* with {@link WifiNanDiscoverySessionCallback#TERMINATE_REASON_DONE}.
	* <p>		* <p>
	* Optional. 0 by default - indicating the session doesn't terminate on its own.		* Optional. 0 by default - indicating the session doesn't terminate on its own.
	* Session will be terminated when {@link WifiNanDiscoveryBaseSession#terminate()} is		* Session will be terminated when {@link WifiNanDiscoveryBaseSession#destroy()} is
	* called.		* called.
	*		*
	* @param subscribeCount Number of subscribe packets to broadcast.		* @param subscribeCount Number of subscribe packets to broadcast.
	@@ -379,7 +379,7 @@ public final class SubscribeConfig implements Parcelable {
	* {@link WifiNanDiscoverySessionCallback#TERMINATE_REASON_DONE}.		* {@link WifiNanDiscoverySessionCallback#TERMINATE_REASON_DONE}.
	* <p>		* <p>
	* Optional. 0 by default - indicating the session doesn't terminate on its own.		* Optional. 0 by default - indicating the session doesn't terminate on its own.
	* Session will be terminated when {@link WifiNanDiscoveryBaseSession#terminate()} is		* Session will be terminated when {@link WifiNanDiscoveryBaseSession#destroy()} is
	* called.		* called.
	*		*
	* @param ttlSec Lifetime of a subscribe session in seconds.		* @param ttlSec Lifetime of a subscribe session in seconds.
	@@ -399,7 +399,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#onMatch(int, byte[], byte[])}		* {@link WifiNanDiscoverySessionCallback#onServiceDiscovered(int, 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).

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	package android.net.wifi.nan;		package android.net.wifi.nan;

	import android.annotation.Nullable;		import android.annotation.Nullable;
			import android.annotation.SystemApi;
	import android.net.wifi.RttManager;		import android.net.wifi.RttManager;
	import android.util.Log;		import android.util.Log;

	@@ -35,7 +36,7 @@ import java.lang.ref.WeakReference;
	* <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, int, byte[])}.
	* </ul>		* </ul>
	* The {@link #terminate()} method must be called to terminate 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.
	*		*
	* @hide PROPOSED_NAN_API		* @hide PROPOSED_NAN_API
	@@ -79,24 +80,24 @@ public class WifiNanDiscoveryBaseSession {
	mClientId = clientId;		mClientId = clientId;
	mSessionId = sessionId;		mSessionId = sessionId;

	mCloseGuard.open("terminate");		mCloseGuard.open("destroy");
	}		}

	/**		/**
	* Terminate the publish or subscribe session - free any resources, and stop		* Destroy the publish or subscribe session - free any resources, and stop
	* transmitting packets on-air (for an active session) or listening for		* transmitting packets on-air (for an active session) or listening for
	* matches (for a passive session). The session may not be used for any		* matches (for a passive session). The session may not be used for any
	* additional operations after termination.		* additional operations after its destruction.
	* <p>		* <p>
	* This operation must be done on a session which is no longer needed. Otherwise system		* This operation must be done on a session which is no longer needed. Otherwise system
	* resources will continue to be utilized until the application terminates. The only		* resources will continue to be utilized until the application exits. The only
	* exception is a session for which we received a termination callback,		* exception is a session for which we received a termination callback,
	* {@link WifiNanDiscoverySessionCallback#onSessionTerminated(int)}.		* {@link WifiNanDiscoverySessionCallback#onSessionTerminated(int)}.
	*/		*/
	public void terminate() {		public void destroy() {
	WifiNanManager mgr = mMgr.get();		WifiNanManager mgr = mMgr.get();
	if (mgr == null) {		if (mgr == null) {
	Log.w(TAG, "terminate: called post GC on WifiNanManager");		Log.w(TAG, "destroy: called post GC on WifiNanManager");
	return;		return;
	}		}

Original line number	Original line	Diff line number	Diff line
	@@ -26,8 +26,8 @@ import java.lang.annotation.RetentionPolicy;
	* Base class for NAN session events callbacks. Should be extended by		* Base class for NAN session events callbacks. Should be extended by
	* applications wanting notifications. The callbacks are set when a		* applications wanting notifications. The callbacks are set when a
	* publish or subscribe session is created using		* publish or subscribe session is created using
	* {@link WifiNanManager#publish(PublishConfig, WifiNanDiscoverySessionCallback)} or		* {@link WifiNanSession#publish(PublishConfig, WifiNanDiscoverySessionCallback)} or
	* {@link WifiNanManager#subscribe(SubscribeConfig, WifiNanDiscoverySessionCallback)} .		* {@link WifiNanSession#subscribe(SubscribeConfig, WifiNanDiscoverySessionCallback)} .
	* <p>		* <p>
	* A single callback is set at session creation - it cannot be replaced.		* A single callback is set at session creation - it cannot be replaced.
	*		*
	@@ -72,7 +72,7 @@ public class WifiNanDiscoverySessionCallback {
	* Indicates transmission failure: this may be due to local transmission		* Indicates transmission failure: this may be due to local transmission
	* failure or to no ACK received - remote device didn't receive the		* failure or to no ACK received - remote device didn't receive the
	* sent message. Failure reason flag for		* sent message. Failure reason flag for
	* {@link WifiNanDiscoverySessionCallback#onMessageSendFail(int, int)} callback.		* {@link WifiNanDiscoverySessionCallback#onMessageSendFailed(int, int)} callback.
	*/		*/
	public static final int REASON_TX_FAIL = 3;		public static final int REASON_TX_FAIL = 3;

	@@ -100,7 +100,7 @@ public class WifiNanDiscoverySessionCallback {

	/**		/**
	* Called when a publish operation is started successfully in response to a		* Called when a publish operation is started successfully in response to a
	* {@link WifiNanManager#publish(PublishConfig, WifiNanDiscoverySessionCallback)} operation.		* {@link WifiNanSession#publish(PublishConfig, WifiNanDiscoverySessionCallback)} operation.
	*		*
	* @param session The {@link WifiNanPublishDiscoverySession} used to control the		* @param session The {@link WifiNanPublishDiscoverySession} used to control the
	* discovery session.		* discovery session.
	@@ -111,7 +111,7 @@ public class WifiNanDiscoverySessionCallback {

	/**		/**
	* Called when a subscribe operation is started successfully in response to a		* Called when a subscribe operation is started successfully in response to a
	* {@link WifiNanManager#subscribe(SubscribeConfig, WifiNanDiscoverySessionCallback)} operation.		* {@link WifiNanSession#subscribe(SubscribeConfig, WifiNanDiscoverySessionCallback)} operation.
	*		*
	* @param session The {@link WifiNanSubscribeDiscoverySession} used to control the		* @param session The {@link WifiNanSubscribeDiscoverySession} used to control the
	* discovery session.		* discovery session.
	@@ -121,19 +121,19 @@ public class WifiNanDiscoverySessionCallback {
	}		}

	/**		/**
	* Called when a publish or subscribe discovery session configuration is update request		* Called when a publish or subscribe discovery session configuration update request
	* succeeds. Called in response to		* succeeds. Called in response to
	* {@link WifiNanPublishDiscoverySession#updatePublish(PublishConfig)} or		* {@link WifiNanPublishDiscoverySession#updatePublish(PublishConfig)} or