Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review" am: 88da460cd8 (b319bc2b) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -50,8 +50,8 @@ interface IWifiNanManager
	// session API		// session API
	void updatePublish(int clientId, int discoverySessionId, in PublishConfig publishConfig);		void updatePublish(int clientId, int discoverySessionId, in PublishConfig publishConfig);
	void updateSubscribe(int clientId, int discoverySessionId, in SubscribeConfig subscribeConfig);		void updateSubscribe(int clientId, int discoverySessionId, in SubscribeConfig subscribeConfig);
	void sendMessage(int clientId, int discoverySessionId, int peerId, in byte[] message, int messageId,		void sendMessage(int clientId, int discoverySessionId, int peerId, in byte[] message,
	int retryCount);		int messageId, int retryCount);
	void terminateSession(int clientId, int discoverySessionId);		void terminateSession(int clientId, int discoverySessionId);
	int startRanging(int clientId, int discoverySessionId, in RttManager.ParcelableRttParams parms);		int startRanging(int clientId, int discoverySessionId, in RttManager.ParcelableRttParams parms);
	}		}

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

+32 −31

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

+9 −8

Original line number	Original line	Diff line number	Diff line
	@@ -125,19 +125,20 @@ public class WifiNanDiscoverySessionCallback {
	* Called when a discovery (publish or subscribe) operation results in a		* Called when a discovery (publish or subscribe) operation results in a
	* service discovery.		* service discovery.
	*		*
	* @param peerId The ID of the peer matching our discovery operation.		* @param peerHandle An opaque handle to the peer matching our discovery operation.
	* @param serviceSpecificInfo The service specific information (arbitrary		* @param serviceSpecificInfo The service specific information (arbitrary
	* byte array) provided by the peer as part of its discovery		* byte array) provided by the peer as part of its discovery
	* configuration.		* configuration.
	* @param matchFilter The filter (Tx on advertiser and Rx on listener) which		* @param matchFilter The filter (Tx on advertiser and Rx on listener) which
	* resulted in this service discovery.		* resulted in this service discovery.
	*/		*/
	public void onServiceDiscovered(int peerId, byte[] serviceSpecificInfo, byte[] matchFilter) {		public void onServiceDiscovered(Object peerHandle, byte[] serviceSpecificInfo,
			byte[] matchFilter) {
	/* empty */		/* empty */
	}		}

	/**		/**
	* Called in response to {@link WifiNanDiscoveryBaseSession#sendMessage(int, int, byte[])}		* Called in response to {@link WifiNanDiscoveryBaseSession#sendMessage(Object, int, byte[])}
	* when a message is transmitted successfully - i.e. when it was received successfully by the		* when a message is transmitted successfully - i.e. when it was received successfully by the
	* peer (corresponds to an ACK being received).		* peer (corresponds to an ACK being received).
	* <p>		* <p>
	@@ -154,7 +155,7 @@ public class WifiNanDiscoverySessionCallback {
	/**		/**
	* Called when message transmission fails - when no ACK is received from the peer.		* Called when message transmission fails - when no ACK is received from the peer.
	* Retries when ACKs are not received are done by hardware, MAC, and in the NAN stack (using		* Retries when ACKs are not received are done by hardware, MAC, and in the NAN stack (using
	* the {@link WifiNanDiscoveryBaseSession#sendMessage(int, int, byte[], int)} method) - this		* the {@link WifiNanDiscoveryBaseSession#sendMessage(Object, int, byte[], int)} method) - this
	* event is received after all retries are exhausted.		* event is received after all retries are exhausted.
	* <p>		* <p>
	* Note that either this callback or		* Note that either this callback or
	@@ -169,13 +170,13 @@ public class WifiNanDiscoverySessionCallback {

	/**		/**
	* Called when a message is received from a discovery session peer - in response to the		* Called when a message is received from a discovery session peer - in response to the
	* peer's {@link WifiNanDiscoveryBaseSession#sendMessage(int, int, byte[])} or		* peer's {@link WifiNanDiscoveryBaseSession#sendMessage(Object, int, byte[])} or
	* {@link WifiNanDiscoveryBaseSession#sendMessage(int, int, byte[], int)}.		* {@link WifiNanDiscoveryBaseSession#sendMessage(Object, int, byte[], int)}.
	*		*
	* @param peerId The ID of the peer sending the message.		* @param peerHandle An opaque handle to the peer matching our discovery operation.
	* @param message A byte array containing the message.		* @param message A byte array containing the message.
	*/		*/
	public void onMessageReceived(int peerId, byte[] message) {		public void onMessageReceived(Object peerHandle, byte[] message) {
	/* empty */		/* empty */
	}		}
	}		}

wifi/java/android/net/wifi/nan/WifiNanManager.java

+30 −28

Original line number	Original line	Diff line number	Diff line
	@@ -63,7 +63,7 @@ import java.util.Arrays;
	* <li>Create a NAN network specifier to be used with		* <li>Create a NAN network specifier to be used with
	* {@link ConnectivityManager#requestNetwork(NetworkRequest, ConnectivityManager.NetworkCallback)}		* {@link ConnectivityManager#requestNetwork(NetworkRequest, ConnectivityManager.NetworkCallback)}
	* to set-up a NAN connection with a peer. Refer to		* to set-up a NAN connection with a peer. Refer to
	* {@link WifiNanDiscoveryBaseSession#createNetworkSpecifier(int, int, byte[])} and		* {@link WifiNanDiscoveryBaseSession#createNetworkSpecifier(int, Object, byte[])} and
	* {@link WifiNanSession#createNetworkSpecifier(int, byte[], byte[])}.		* {@link WifiNanSession#createNetworkSpecifier(int, byte[], byte[])}.
	* </ul>		* </ul>
	* <p>		* <p>
	@@ -86,8 +86,8 @@ import java.util.Arrays;
	* <p>		* <p>
	* Once a NAN attach is confirmed use the		* Once a NAN attach is confirmed use the
	* {@link WifiNanSession#publish(Handler, PublishConfig, WifiNanDiscoverySessionCallback)} or		* {@link WifiNanSession#publish(Handler, PublishConfig, WifiNanDiscoverySessionCallback)} or
	* {@link WifiNanSession#subscribe(Handler, SubscribeConfig, WifiNanDiscoverySessionCallback)} to		* {@link WifiNanSession#subscribe(Handler, SubscribeConfig, WifiNanDiscoverySessionCallback)}
	* create publish or subscribe NAN discovery sessions. Events are called on the provided		* to create publish or subscribe NAN discovery sessions. Events are called on the provided
	* callback object {@link WifiNanDiscoverySessionCallback}. Specifically, the		* callback object {@link WifiNanDiscoverySessionCallback}. Specifically, the
	* {@link WifiNanDiscoverySessionCallback#onPublishStarted(WifiNanPublishDiscoverySession)}		* {@link WifiNanDiscoverySessionCallback#onPublishStarted(WifiNanPublishDiscoverySession)}
	* and		* and
	@@ -97,8 +97,8 @@ import java.util.Arrays;
	* the session {@link WifiNanPublishDiscoverySession#updatePublish(PublishConfig)} and		* the session {@link WifiNanPublishDiscoverySession#updatePublish(PublishConfig)} and
	* {@link WifiNanSubscribeDiscoverySession#updateSubscribe(SubscribeConfig)}. Sessions can also		* {@link WifiNanSubscribeDiscoverySession#updateSubscribe(SubscribeConfig)}. Sessions can also
	* be used to send messages using the		* be used to send messages using the
	* {@link WifiNanDiscoveryBaseSession#sendMessage(int, int, byte[])} APIs. When an application		* {@link WifiNanDiscoveryBaseSession#sendMessage(Object, int, byte[])} APIs. When an
	* is finished with a discovery session it <b>must</b> terminate it using the		* application is finished with a discovery session it <b>must</b> terminate it using the
	* {@link WifiNanDiscoveryBaseSession#destroy()} API.		* {@link WifiNanDiscoveryBaseSession#destroy()} API.
	* <p>		* <p>
	* Creating connections between NAN devices is managed by the standard		* Creating connections between NAN devices is managed by the standard
	@@ -109,7 +109,7 @@ import java.util.Arrays;
	* {@link android.net.NetworkCapabilities#TRANSPORT_WIFI_NAN}.		* {@link android.net.NetworkCapabilities#TRANSPORT_WIFI_NAN}.
	* <li>{@link NetworkRequest.Builder#setNetworkSpecifier(String)} using		* <li>{@link NetworkRequest.Builder#setNetworkSpecifier(String)} using
	* {@link WifiNanSession#createNetworkSpecifier(int, byte[], byte[])} or		* {@link WifiNanSession#createNetworkSpecifier(int, byte[], byte[])} or
	* {@link WifiNanDiscoveryBaseSession#createNetworkSpecifier(int, int, byte[])}.		* {@link WifiNanDiscoveryBaseSession#createNetworkSpecifier(int, Object, byte[])}.
	* </ul>		* </ul>
	*		*
	* @hide PROPOSED_NAN_API		* @hide PROPOSED_NAN_API
	@@ -217,7 +217,7 @@ public class WifiNanManager {
	* Connection creation role is that of INITIATOR. Used to create a network specifier string		* Connection creation role is that of INITIATOR. Used to create a network specifier string
	* when requesting a NAN network.		* when requesting a NAN network.
	*		*
	* @see WifiNanDiscoveryBaseSession#createNetworkSpecifier(int, int, byte[])		* @see WifiNanDiscoveryBaseSession#createNetworkSpecifier(int, Object, byte[])
	* @see WifiNanSession#createNetworkSpecifier(int, byte[], byte[])		* @see WifiNanSession#createNetworkSpecifier(int, byte[], byte[])
	*/		*/
	public static final int WIFI_NAN_DATA_PATH_ROLE_INITIATOR = 0;		public static final int WIFI_NAN_DATA_PATH_ROLE_INITIATOR = 0;
	@@ -226,7 +226,7 @@ public class WifiNanManager {
	* Connection creation role is that of RESPONDER. Used to create a network specifier string		* Connection creation role is that of RESPONDER. Used to create a network specifier string
	* when requesting a NAN network.		* when requesting a NAN network.
	*		*
	* @see WifiNanDiscoveryBaseSession#createNetworkSpecifier(int, int, byte[])		* @see WifiNanDiscoveryBaseSession#createNetworkSpecifier(int, Object, byte[])
	* @see WifiNanSession#createNetworkSpecifier(int, byte[], byte[])		* @see WifiNanSession#createNetworkSpecifier(int, byte[], byte[])
	*/		*/
	public static final int WIFI_NAN_DATA_PATH_ROLE_RESPONDER = 1;		public static final int WIFI_NAN_DATA_PATH_ROLE_RESPONDER = 1;
	@@ -457,16 +457,17 @@ public class WifiNanManager {
	}		}

	/** @hide */		/** @hide */
	public void sendMessage(int clientId, int sessionId, int peerId, byte[] message, int messageId,		public void sendMessage(int clientId, int sessionId, Object peerHandle, byte[] message,
	int retryCount) {		int messageId, int retryCount) {
	if (VDBG) {		if (VDBG) {
	Log.v(TAG,		Log.v(TAG, "sendMessage(): clientId=" + clientId + ", sessionId=" + sessionId
	"sendMessage(): clientId=" + clientId + ", sessionId=" + sessionId + ", peerId="		+ ", peerHandle=" + peerHandle + ", messageId=" + messageId + ", retryCount="
	+ peerId + ", messageId=" + messageId + ", retryCount=" + retryCount);		+ retryCount);
	}		}

	try {		try {
	mService.sendMessage(clientId, sessionId, peerId, message, messageId, retryCount);		mService.sendMessage(clientId, sessionId, (Integer) peerHandle, message, messageId,
			retryCount);
	} catch (RemoteException e) {		} catch (RemoteException e) {
	throw e.rethrowFromSystemServer();		throw e.rethrowFromSystemServer();
	}		}
	@@ -494,19 +495,19 @@ public class WifiNanManager {
	}		}

	/** @hide */		/** @hide */
	public String createNetworkSpecifier(int clientId, int role, int sessionId, int peerId,		public String createNetworkSpecifier(int clientId, int role, int sessionId, Object peerHandle,
	byte[] token) {		byte[] token) {
	if (VDBG) {		if (VDBG) {
	Log.v(TAG, "createNetworkSpecifier: role=" + role + ", sessionId=" + sessionId		Log.v(TAG, "createNetworkSpecifier: role=" + role + ", sessionId=" + sessionId
	+ ", peerId=" + peerId + ", token=" + token);		+ ", peerHandle=" + peerHandle + ", token=" + token);
	}		}

	int type;		int type;
	if (token != null && peerId != 0) {		if (token != null && peerHandle != null) {
	type = NETWORK_SPECIFIER_TYPE_1A;		type = NETWORK_SPECIFIER_TYPE_1A;
	} else if (token == null && peerId != 0) {		} else if (token == null && peerHandle != null) {
	type = NETWORK_SPECIFIER_TYPE_1B;		type = NETWORK_SPECIFIER_TYPE_1B;
	} else if (token != null && peerId == 0) {		} else if (token != null && peerHandle == null) {
	type = NETWORK_SPECIFIER_TYPE_1C;		type = NETWORK_SPECIFIER_TYPE_1C;
	} else {		} else {
	type = NETWORK_SPECIFIER_TYPE_1D;		type = NETWORK_SPECIFIER_TYPE_1D;
	@@ -523,10 +524,10 @@ public class WifiNanManager {
	throw new IllegalArgumentException(		throw new IllegalArgumentException(
	"createNetworkSpecifier: Invalid null token - not permitted on INITIATOR");		"createNetworkSpecifier: Invalid null token - not permitted on INITIATOR");
	}		}
	if (peerId == 0) {		if (peerHandle == null) {
	throw new IllegalArgumentException(		throw new IllegalArgumentException(
	"createNetworkSpecifier: Invalid peer ID (value of 0) - not permitted on "		"createNetworkSpecifier: Invalid peer handle (value of null) - not "
	+ "INITIATOR");		+ "permitted on INITIATOR");
	}		}
	}		}

	@@ -537,8 +538,8 @@ public class WifiNanManager {
	json.put(NETWORK_SPECIFIER_KEY_ROLE, role);		json.put(NETWORK_SPECIFIER_KEY_ROLE, role);
	json.put(NETWORK_SPECIFIER_KEY_CLIENT_ID, clientId);		json.put(NETWORK_SPECIFIER_KEY_CLIENT_ID, clientId);
	json.put(NETWORK_SPECIFIER_KEY_SESSION_ID, sessionId);		json.put(NETWORK_SPECIFIER_KEY_SESSION_ID, sessionId);
	if (peerId != 0) {		if (peerHandle != null) {
	json.put(NETWORK_SPECIFIER_KEY_PEER_ID, peerId);		json.put(NETWORK_SPECIFIER_KEY_PEER_ID, (Integer) peerHandle);
	}		}
	if (token != null) {		if (token != null) {
	json.put(NETWORK_SPECIFIER_KEY_TOKEN,		json.put(NETWORK_SPECIFIER_KEY_TOKEN,
	@@ -552,8 +553,8 @@ public class WifiNanManager {
	}		}

	/** @hide */		/** @hide */
	public String createNetworkSpecifier(int clientId, @DataPathRole int role, @Nullable byte[] peer,		public String createNetworkSpecifier(int clientId, @DataPathRole int role,
	@Nullable byte[] token) {		@Nullable byte[] peer, @Nullable byte[] token) {
	if (VDBG) {		if (VDBG) {
	Log.v(TAG, "createNetworkSpecifier: role=" + role + ", token=" + token);		Log.v(TAG, "createNetworkSpecifier: role=" + role + ", token=" + token);
	}		}
	@@ -843,7 +844,7 @@ public class WifiNanManager {
	break;		break;
	case CALLBACK_MATCH:		case CALLBACK_MATCH:
	mOriginalCallback.onServiceDiscovered(		mOriginalCallback.onServiceDiscovered(
	msg.arg1,		Integer.valueOf(msg.arg1),
	msg.getData().getByteArray(MESSAGE_BUNDLE_KEY_MESSAGE),		msg.getData().getByteArray(MESSAGE_BUNDLE_KEY_MESSAGE),
	msg.getData().getByteArray(MESSAGE_BUNDLE_KEY_MESSAGE2));		msg.getData().getByteArray(MESSAGE_BUNDLE_KEY_MESSAGE2));
	break;		break;
	@@ -854,7 +855,8 @@ public class WifiNanManager {
	mOriginalCallback.onMessageSendFailed(msg.arg1);		mOriginalCallback.onMessageSendFailed(msg.arg1);
	break;		break;
	case CALLBACK_MESSAGE_RECEIVED:		case CALLBACK_MESSAGE_RECEIVED:
	mOriginalCallback.onMessageReceived(msg.arg1, (byte[]) msg.obj);		mOriginalCallback.onMessageReceived(Integer.valueOf(msg.arg1),
			(byte[]) msg.obj);
	break;		break;
	}		}
	}		}

wifi/java/android/net/wifi/nan/WifiNanSession.java

+5 −3