Merge "[AWARE] Simplify Wi-Fi Aware API namespace" (834a87d5) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/aware/WifiAwareAttachCallback.java→wifi/java/android/net/wifi/aware/AttachCallback.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -18,16 +18,16 @@ package android.net.wifi.aware;

		/**
		* Base class for Aware attach callbacks. Should be extended by applications and set when calling
		* {@link WifiAwareManager#attach(WifiAwareAttachCallback, android.os.Handler)}. These are callbacks
		* {@link WifiAwareManager#attach(AttachCallback, android.os.Handler)}. These are callbacks
		* applying to the Aware connection as a whole - not to specific publish or subscribe sessions -
		* for that see {@link WifiAwareDiscoverySessionCallback}.
		* for that see {@link DiscoverySessionCallback}.
		*
		* @hide PROPOSED_AWARE_API
		*/
		public class WifiAwareAttachCallback {
		public class AttachCallback {
		/**
		* Called when Aware attach operation
		* {@link WifiAwareManager#attach(WifiAwareAttachCallback, android.os.Handler)}
		* {@link WifiAwareManager#attach(AttachCallback, android.os.Handler)}
		* is completed and that we can now start discovery sessions or connections.
		*
		* @param session The Aware object on which we can execute further Aware operations - e.g.
		@@ -39,7 +39,7 @@ public class WifiAwareAttachCallback {

		/**
		* Called when Aware attach operation
		* {@link WifiAwareManager#attach(WifiAwareAttachCallback, android.os.Handler)} failed.
		* {@link WifiAwareManager#attach(AttachCallback, android.os.Handler)} failed.
		*/
		public void onAttachFailed() {
		/* empty */

wifi/java/android/net/wifi/aware/WifiAwareCharacteristics.aidl→wifi/java/android/net/wifi/aware/Characteristics.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,4 +16,4 @@

		package android.net.wifi.aware;

		parcelable WifiAwareCharacteristics;
		parcelable Characteristics;

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

+9 −9

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ import android.os.Parcelable;
		*
		* @hide PROPOSED_AWARE_API
		*/
		public class WifiAwareCharacteristics implements Parcelable {
		public class Characteristics implements Parcelable {
		/** @hide */
		public static final String KEY_MAX_SERVICE_NAME_LENGTH = "key_max_service_name_length";
		/** @hide */
		@@ -37,7 +37,7 @@ public class WifiAwareCharacteristics implements Parcelable {
		private Bundle mCharacteristics = new Bundle();

		/** @hide : should not be created by apps */
		public WifiAwareCharacteristics(Bundle characteristics) {
		public Characteristics(Bundle characteristics) {
		mCharacteristics = characteristics;
		}

		@@ -58,7 +58,7 @@ public class WifiAwareCharacteristics implements Parcelable {
		* message exchange. Restricts the parameters of the
		* {@link PublishConfig.Builder#setServiceSpecificInfo(byte[])},
		* {@link SubscribeConfig.Builder#setServiceSpecificInfo(byte[])}, and
		* {@link WifiAwareDiscoveryBaseSession#sendMessage(WifiAwareManager.PeerHandle, int, byte[])}
		* {@link DiscoverySession#sendMessage(PeerHandle, int, byte[])}
		* variants.
		*
		* @return A positive integer, maximum length of byte array for Aware messaging.
		@@ -89,17 +89,17 @@ public class WifiAwareCharacteristics implements Parcelable {
		return 0;
		}

		public static final Creator<WifiAwareCharacteristics> CREATOR =
		new Creator<WifiAwareCharacteristics>() {
		public static final Creator<Characteristics> CREATOR =
		new Creator<Characteristics>() {
		@Override
		public WifiAwareCharacteristics createFromParcel(Parcel in) {
		WifiAwareCharacteristics c = new WifiAwareCharacteristics(in.readBundle());
		public Characteristics createFromParcel(Parcel in) {
		Characteristics c = new Characteristics(in.readBundle());
		return c;
		}

		@Override
		public WifiAwareCharacteristics[] newArray(int size) {
		return new WifiAwareCharacteristics[size];
		public Characteristics[] newArray(int size) {
		return new Characteristics[size];
		}
		};
		}

wifi/java/android/net/wifi/aware/ConfigRequest.java

+1 −1

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

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

+32 −32

Original line number	Diff line number	Diff line
		@@ -29,21 +29,21 @@ import java.lang.ref.WeakReference;
		/**
		* A class representing a single publish or subscribe Aware session. This object
		* will not be created directly - only its child classes are available:
		* {@link WifiAwarePublishDiscoverySession} and {@link WifiAwareSubscribeDiscoverySession}. This
		* {@link PublishDiscoverySession} and {@link SubscribeDiscoverySession}. This
		* class provides functionality common to both publish and subscribe discovery sessions:
		* <ul>
		* <li>Sending messages: {@link #sendMessage(WifiAwareManager.PeerHandle, int, byte[])} or
		* {@link #sendMessage(WifiAwareManager.PeerHandle, int, byte[], int)} methods.
		* <li>Sending messages: {@link #sendMessage(PeerHandle, int, byte[])} or
		* {@link #sendMessage(PeerHandle, int, byte[], int)} methods.
		* <li>Creating a network-specifier when requesting a Aware connection:
		* {@link #createNetworkSpecifier(WifiAwareManager.PeerHandle, byte[])}.
		* {@link #createNetworkSpecifier(PeerHandle, byte[])}.
		* </ul>
		* The {@link #destroy()} method must be called to destroy discovery sessions once they are
		* no longer needed.
		*
		* @hide PROPOSED_AWARE_API
		*/
		public class WifiAwareDiscoveryBaseSession {
		private static final String TAG = "WifiAwareDiscBaseSsn";
		public class DiscoverySession {
		private static final String TAG = "DiscoverySession";
		private static final boolean DBG = false;
		private static final boolean VDBG = false; // STOPSHIP if true

		@@ -62,7 +62,7 @@ public class WifiAwareDiscoveryBaseSession {

		/**
		* Return the maximum permitted retry count when sending messages using
		* {@link #sendMessage(WifiAwareManager.PeerHandle, int, byte[], int)}.
		* {@link #sendMessage(PeerHandle, int, byte[], int)}.
		*
		* @return Maximum retry count when sending messages.
		*/
		@@ -71,7 +71,7 @@ public class WifiAwareDiscoveryBaseSession {
		}

		/** @hide */
		public WifiAwareDiscoveryBaseSession(WifiAwareManager manager, int clientId, int sessionId) {
		public DiscoverySession(WifiAwareManager manager, int clientId, int sessionId) {
		if (VDBG) {
		Log.v(TAG, "New discovery session created: manager=" + manager + ", clientId="
		+ clientId + ", sessionId=" + sessionId);
		@@ -93,7 +93,7 @@ public class WifiAwareDiscoveryBaseSession {
		* This operation must be done on a session which is no longer needed. Otherwise system
		* resources will continue to be utilized until the application exits. The only
		* exception is a session for which we received a termination callback,
		* {@link WifiAwareDiscoverySessionCallback#onSessionTerminated(int)}.
		* {@link DiscoverySessionCallback#onSessionTerminated(int)}.
		*/
		public void destroy() {
		WifiAwareManager mgr = mMgr.get();
		@@ -139,23 +139,23 @@ 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,
		* {@link DiscoverySessionCallback#onServiceDiscovered(PeerHandle,
		* byte[], java.util.List)} event.
		* <p>
		* Aware messages are not guaranteed delivery. Callbacks on
		* {@link WifiAwareDiscoverySessionCallback} indicate message was transmitted successfully,
		* {@link WifiAwareDiscoverySessionCallback#onMessageSendSucceeded(int)}, or transmission
		* {@link DiscoverySessionCallback} indicate message was transmitted successfully,
		* {@link DiscoverySessionCallback#onMessageSendSucceeded(int)}, or transmission
		* failed (possibly after several retries) -
		* {@link WifiAwareDiscoverySessionCallback#onMessageSendFailed(int)}.
		* {@link DiscoverySessionCallback#onMessageSendFailed(int)}.
		* <p>
		* The peer will get a callback indicating a message was received using
		* {@link WifiAwareDiscoverySessionCallback#onMessageReceived(WifiAwareManager.PeerHandle,
		* {@link DiscoverySessionCallback#onMessageReceived(PeerHandle,
		* byte[])}.
		*
		* @param peerHandle The peer's handle for the message. Must be a result of an
		* {@link WifiAwareDiscoverySessionCallback#onServiceDiscovered(WifiAwareManager.PeerHandle,
		* {@link DiscoverySessionCallback#onServiceDiscovered(PeerHandle,
		* byte[], java.util.List)} or
		* {@link WifiAwareDiscoverySessionCallback#onMessageReceived(WifiAwareManager.PeerHandle,
		* {@link DiscoverySessionCallback#onMessageReceived(PeerHandle,
		* byte[])} events.
		* @param messageId An arbitrary integer used by the caller to identify the message. The same
		* integer ID will be returned in the callbacks indicating message send success or
		@@ -167,7 +167,7 @@ public class WifiAwareDiscoveryBaseSession {
		* (note: no retransmissions are attempted in other failure cases). A value of 0
		* indicates no retries. Max permitted value is {@link #getMaxSendRetryCount()}.
		*/
		public void sendMessage(@NonNull WifiAwareManager.PeerHandle peerHandle, int messageId,
		public void sendMessage(@NonNull PeerHandle peerHandle, int messageId,
		@Nullable byte[] message, int retryCount) {
		if (mTerminated) {
		Log.w(TAG, "sendMessage: called on terminated session");
		@@ -186,25 +186,25 @@ 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,
		* {@link DiscoverySessionCallback#onServiceDiscovered(PeerHandle,
		* byte[], java.util.List)} event.
		* <p>
		* Aware messages are not guaranteed delivery. Callbacks on
		* {@link WifiAwareDiscoverySessionCallback} indicate message was transmitted successfully,
		* {@link WifiAwareDiscoverySessionCallback#onMessageSendSucceeded(int)}, or transmission
		* {@link DiscoverySessionCallback} indicate message was transmitted successfully,
		* {@link DiscoverySessionCallback#onMessageSendSucceeded(int)}, or transmission
		* failed (possibly after several retries) -
		* {@link WifiAwareDiscoverySessionCallback#onMessageSendFailed(int)}.
		* {@link DiscoverySessionCallback#onMessageSendFailed(int)}.
		* <p>
		* The peer will get a callback indicating a message was received using
		* {@link WifiAwareDiscoverySessionCallback#onMessageReceived(WifiAwareManager.PeerHandle,
		* {@link DiscoverySessionCallback#onMessageReceived(PeerHandle,
		* byte[])}.
		* Equivalent to {@link #sendMessage(WifiAwareManager.PeerHandle, int, byte[], int)}
		* Equivalent to {@link #sendMessage(PeerHandle, int, byte[], int)}
		* with a {@code retryCount} of 0.
		*
		* @param peerHandle The peer's handle for the message. Must be a result of an
		* {@link WifiAwareDiscoverySessionCallback#onServiceDiscovered(WifiAwareManager.PeerHandle,
		* {@link DiscoverySessionCallback#onServiceDiscovered(PeerHandle,
		* byte[], java.util.List)} or
		* {@link WifiAwareDiscoverySessionCallback#onMessageReceived(WifiAwareManager.PeerHandle,
		* {@link DiscoverySessionCallback#onMessageReceived(PeerHandle,
		* byte[])} events.
		* @param messageId An arbitrary integer used by the caller to identify the message. The same
		* integer ID will be returned in the callbacks indicating message send success or
		@@ -212,16 +212,16 @@ public class WifiAwareDiscoveryBaseSession {
		* can be arbitrary and non-unique.
		* @param message The message to be transmitted.
		*/
		public void sendMessage(@NonNull WifiAwareManager.PeerHandle peerHandle, int messageId,
		public void sendMessage(@NonNull PeerHandle peerHandle, int messageId,
		@Nullable byte[] message) {
		sendMessage(peerHandle, messageId, message, 0);
		}

		/**
		* Start a ranging operation with the specified peers. The peer IDs are obtained from an
		* {@link WifiAwareDiscoverySessionCallback#onServiceDiscovered(WifiAwareManager.PeerHandle,
		* {@link DiscoverySessionCallback#onServiceDiscovered(PeerHandle,
		* byte[], java.util.List)} or
		* {@link WifiAwareDiscoverySessionCallback#onMessageReceived(WifiAwareManager.PeerHandle,
		* {@link DiscoverySessionCallback#onMessageReceived(PeerHandle,
		* byte[])} operation - can
		* only range devices which are part of an ongoing discovery session.
		*
		@@ -265,9 +265,9 @@ public class WifiAwareDiscoveryBaseSession {
		* and a Publisher is a RESPONDER.
		*
		* @param peerHandle The peer's handle obtained through
		* {@link WifiAwareDiscoverySessionCallback#onServiceDiscovered(WifiAwareManager.PeerHandle,
		* {@link DiscoverySessionCallback#onServiceDiscovered(PeerHandle,
		* byte[], java.util.List)} or
		* {@link WifiAwareDiscoverySessionCallback#onMessageReceived(WifiAwareManager.PeerHandle,
		* {@link DiscoverySessionCallback#onMessageReceived(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
		* it will accept connection requests from any device.
		@@ -283,7 +283,7 @@ public class WifiAwareDiscoveryBaseSession {
		* android.net.ConnectivityManager.NetworkCallback)}
		* [or other varieties of that API].
		*/
		public String createNetworkSpecifier(@Nullable WifiAwareManager.PeerHandle peerHandle,
		public String createNetworkSpecifier(@Nullable PeerHandle peerHandle,
		@Nullable byte[] token) {
		if (mTerminated) {
		Log.w(TAG, "createNetworkSpecifier: called on terminated session");
		@@ -295,7 +295,7 @@ public class WifiAwareDiscoveryBaseSession {
		return null;
		}

		int role = this instanceof WifiAwareSubscribeDiscoverySession
		int role = this instanceof SubscribeDiscoverySession
		? WifiAwareManager.WIFI_AWARE_DATA_PATH_ROLE_INITIATOR
		: WifiAwareManager.WIFI_AWARE_DATA_PATH_ROLE_RESPONDER;