Merge "[AWARE] Simplify Wi-Fi Aware API namespace" am: 834a87d525 am: fd23421472 am: 0bad91b5ac (9a26e434) · 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	Original line	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		* 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 -		* 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		* @hide PROPOSED_AWARE_API
	*/		*/
	public class WifiAwareAttachCallback {		public class AttachCallback {
	/**		/**
	* Called when Aware attach operation		* 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.		* 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.		* @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		* Called when Aware attach operation
	* {@link WifiAwareManager#attach(WifiAwareAttachCallback, android.os.Handler)} failed.		* {@link WifiAwareManager#attach(AttachCallback, android.os.Handler)} failed.
	*/		*/
	public void onAttachFailed() {		public void onAttachFailed() {
	/* empty */		/* empty */

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

+1 −1

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

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

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

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

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

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

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

+1 −1

Original line number	Original line	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		* Defines a request object to configure a Wi-Fi Aware network. Built using
	* {@link ConfigRequest.Builder}. Configuration is requested 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		* 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/aware/WifiAwareDiscoveryBaseSession.java→wifi/java/android/net/wifi/aware/DiscoverySession.java

+32 −32

Original line number	Original line	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		* A class representing a single publish or subscribe Aware session. This object
	* will not be created directly - only its child classes are available:		* 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:		* class provides functionality common to both publish and subscribe discovery sessions:
	* <ul>		* <ul>
	* <li>Sending messages: {@link #sendMessage(WifiAwareManager.PeerHandle, int, byte[])} or		* <li>Sending messages: {@link #sendMessage(PeerHandle, int, byte[])} or
	* {@link #sendMessage(WifiAwareManager.PeerHandle, int, byte[], int)} methods.		* {@link #sendMessage(PeerHandle, int, byte[], int)} methods.
	* <li>Creating a network-specifier when requesting a Aware connection:		* <li>Creating a network-specifier when requesting a Aware connection:
	* {@link #createNetworkSpecifier(WifiAwareManager.PeerHandle, byte[])}.		* {@link #createNetworkSpecifier(PeerHandle, byte[])}.
	* </ul>		* </ul>
	* The {@link #destroy()} method must be called to destroy 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_AWARE_API		* @hide PROPOSED_AWARE_API
	*/		*/
	public class WifiAwareDiscoveryBaseSession {		public class DiscoverySession {
	private static final String TAG = "WifiAwareDiscBaseSsn";		private static final String TAG = "DiscoverySession";
	private static final boolean DBG = false;		private static final boolean DBG = false;
	private static final boolean VDBG = false; // STOPSHIP if true		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		* 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.		* @return Maximum retry count when sending messages.
	*/		*/
	@@ -71,7 +71,7 @@ public class WifiAwareDiscoveryBaseSession {
	}		}

	/** @hide */		/** @hide */
	public WifiAwareDiscoveryBaseSession(WifiAwareManager manager, int clientId, int sessionId) {		public DiscoverySession(WifiAwareManager manager, int clientId, int sessionId) {
	if (VDBG) {		if (VDBG) {
	Log.v(TAG, "New discovery session created: manager=" + manager + ", clientId="		Log.v(TAG, "New discovery session created: manager=" + manager + ", clientId="
	+ clientId + ", sessionId=" + sessionId);		+ 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		* This operation must be done on a session which is no longer needed. Otherwise system