Merge "p2p: WiFi Direct API for requesting p2p info" (f20ea0fa) · Commits · e / os / android_frameworks_base

api/current.txt

+15 −0

Original line number	Diff line number	Diff line
		@@ -29489,7 +29489,10 @@ package android.net.wifi.p2p {
		method public void removeLocalService(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener);
		method public void removeServiceRequest(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceRequest, android.net.wifi.p2p.WifiP2pManager.ActionListener);
		method public void requestConnectionInfo(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ConnectionInfoListener);
		method public void requestDiscoveryState(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.DiscoveryStateListener);
		method public void requestGroupInfo(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.GroupInfoListener);
		method public void requestNetworkInfo(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.NetworkInfoListener);
		method public void requestP2pState(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.P2pStateListener);
		method public void requestPeers(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.PeerListListener);
		method public void setDnsSdResponseListeners(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.DnsSdServiceResponseListener, android.net.wifi.p2p.WifiP2pManager.DnsSdTxtRecordListener);
		method public void setServiceResponseListener(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ServiceResponseListener);
		@@ -29534,6 +29537,10 @@ package android.net.wifi.p2p {
		method public abstract void onConnectionInfoAvailable(android.net.wifi.p2p.WifiP2pInfo);
		}

		public static abstract interface WifiP2pManager.DiscoveryStateListener {
		method public abstract void onDiscoveryStateAvailable(int);
		}

		public static abstract interface WifiP2pManager.DnsSdServiceResponseListener {
		method public abstract void onDnsSdServiceAvailable(java.lang.String, java.lang.String, android.net.wifi.p2p.WifiP2pDevice);
		}
		@@ -29546,6 +29553,14 @@ package android.net.wifi.p2p {
		method public abstract void onGroupInfoAvailable(android.net.wifi.p2p.WifiP2pGroup);
		}

		public static abstract interface WifiP2pManager.NetworkInfoListener {
		method public abstract void onNetworkInfoAvailable(android.net.NetworkInfo);
		}

		public static abstract interface WifiP2pManager.P2pStateListener {
		method public abstract void onP2pStateAvailable(int);
		}

		public static abstract interface WifiP2pManager.PeerListListener {
		method public abstract void onPeersAvailable(android.net.wifi.p2p.WifiP2pDeviceList);
		}

wifi/java/android/net/wifi/p2p/WifiP2pManager.java

+154 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.net.wifi.p2p;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		@@ -25,6 +26,7 @@ import android.annotation.SystemApi;
		import android.annotation.SystemService;
		import android.annotation.UnsupportedAppUsage;
		import android.content.Context;
		import android.net.NetworkInfo;
		import android.net.wifi.WpsInfo;
		import android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceInfo;
		import android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceResponse;
		@@ -49,6 +51,8 @@ import com.android.internal.util.Protocol;

		import dalvik.system.CloseGuard;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.HashMap;
		import java.util.List;
		import java.util.Map;
		@@ -158,6 +162,14 @@ public class WifiP2pManager {
		*/
		public static final String EXTRA_WIFI_STATE = "wifi_p2p_state";

		/** @hide */
		@IntDef({
		WIFI_P2P_STATE_DISABLED,
		WIFI_P2P_STATE_ENABLED})
		@Retention(RetentionPolicy.SOURCE)
		public @interface WifiP2pState {
		}

		/**
		* Wi-Fi p2p is disabled.
		*
		@@ -250,6 +262,14 @@ public class WifiP2pManager {
		*/
		public static final String EXTRA_DISCOVERY_STATE = "discoveryState";

		/** @hide */
		@IntDef({
		WIFI_P2P_DISCOVERY_STOPPED,
		WIFI_P2P_DISCOVERY_STARTED})
		@Retention(RetentionPolicy.SOURCE)
		public @interface WifiP2pDiscoveryState {
		}

		/**
		* p2p discovery has stopped
		*
		@@ -502,6 +522,21 @@ public class WifiP2pManager {
		/** @hide */
		public static final int SET_ONGOING_PEER_CONFIG_SUCCEEDED = BASE + 89;

		/** @hide */
		public static final int REQUEST_P2P_STATE = BASE + 90;
		/** @hide */
		public static final int RESPONSE_P2P_STATE = BASE + 91;

		/** @hide */
		public static final int REQUEST_DISCOVERY_STATE = BASE + 92;
		/** @hide */
		public static final int RESPONSE_DISCOVERY_STATE = BASE + 93;

		/** @hide */
		public static final int REQUEST_NETWORK_INFO = BASE + 94;
		/** @hide */
		public static final int RESPONSE_NETWORK_INFO = BASE + 95;

		/**
		* Create a new WifiP2pManager instance. Applications use
		* {@link android.content.Context#getSystemService Context.getSystemService()} to retrieve
		@@ -690,6 +725,43 @@ public class WifiP2pManager {
		public void onHandoverMessageAvailable(String handoverMessage);
		}

		/** Interface for callback invocation when p2p state is available
		* in response to {@link #requestP2pState}.
		*/
		public interface P2pStateListener {
		/**
		* The requested p2p state is available.
		* @param state Wi-Fi p2p state
		* @see #WIFI_P2P_STATE_DISABLED
		* @see #WIFI_P2P_STATE_ENABLED
		*/
		void onP2pStateAvailable(@WifiP2pState int state);
		}

		/** Interface for callback invocation when p2p state is available
		* in response to {@link #requestDiscoveryState}.
		*/
		public interface DiscoveryStateListener {
		/**
		* The requested p2p discovery state is available.
		* @param state Wi-Fi p2p discovery state
		* @see #WIFI_P2P_DISCOVERY_STARTED
		* @see #WIFI_P2P_DISCOVERY_STOPPED
		*/
		void onDiscoveryStateAvailable(@WifiP2pDiscoveryState int state);
		}

		/** Interface for callback invocation when {@link android.net.NetworkInfo} is available
		* in response to {@link #requestNetworkInfo}.
		*/
		public interface NetworkInfoListener {
		/**
		* The requested {@link android.net.NetworkInfo} is available
		* @param networkInfo Wi-Fi p2p {@link android.net.NetworkInfo}
		*/
		void onNetworkInfoAvailable(NetworkInfo networkInfo);
		}

		/**
		* Interface for callback invocation when ongoing peer info is available
		* @hide
		@@ -889,6 +961,24 @@ public class WifiP2pManager {
		.onOngoingPeerAvailable(peerConfig);
		}
		break;
		case RESPONSE_P2P_STATE:
		if (listener != null) {
		((P2pStateListener) listener)
		.onP2pStateAvailable(message.arg1);
		}
		break;
		case RESPONSE_DISCOVERY_STATE:
		if (listener != null) {
		((DiscoveryStateListener) listener)
		.onDiscoveryStateAvailable(message.arg1);
		}
		break;
		case RESPONSE_NETWORK_INFO:
		if (listener != null) {
		((NetworkInfoListener) listener)
		.onNetworkInfoAvailable((NetworkInfo) message.obj);
		}
		break;
		default:
		Log.d(TAG, "Ignored " + message);
		break;
		@@ -1616,4 +1706,68 @@ public class WifiP2pManager {
		c.mAsyncChannel.sendMessage(SET_ONGOING_PEER_CONFIG, 0,
		c.putListener(listener), config);
		}

		/**
		* Request p2p enabled state.
		*
		* <p> This state indicates whether Wi-Fi p2p is enabled or disabled.
		* The valid value is one of {@link #WIFI_P2P_STATE_DISABLED} or
		* {@link #WIFI_P2P_STATE_ENABLED}. The state is returned using the
		* {@link #P2pStateListener} listener.
		*
		* <p> This state is also included in the {@link #WIFI_P2P_STATE_CHANGED_ACTION}
		* broadcast event with extra {@link #EXTRA_WIFI_STATE}.
		*
		* @param c is the channel created at {@link #initialize}.
		* @param listener for callback when p2p state is available..
		*/
		public void requestP2pState(@NonNull Channel c,
		@NonNull P2pStateListener listener) {
		checkChannel(c);
		if (listener == null) throw new IllegalArgumentException("This listener cannot be null.");
		c.mAsyncChannel.sendMessage(REQUEST_P2P_STATE, 0, c.putListener(listener));
		}

		/**
		* Request p2p discovery state.
		*
		* <p> This state indicates whether p2p discovery has started or stopped.
		* The valid value is one of {@link #WIFI_P2P_DISCOVERY_STARTED} or
		* {@link #WIFI_P2P_DISCOVERY_STOPPED}. The state is returned using the
		* {@link #DiscoveryStateListener} listener.
		*
		* <p> This state is also included in the {@link #WIFI_P2P_DISCOVERY_CHANGED_ACTION}
		* broadcast event with extra {@link #EXTRA_DISCOVERY_STATE}.
		*
		* @param c is the channel created at {@link #initialize}.
		* @param listener for callback when discovery state is available..
		*/
		public void requestDiscoveryState(@NonNull Channel c,
		@NonNull DiscoveryStateListener listener) {
		checkChannel(c);
		if (listener == null) throw new IllegalArgumentException("This listener cannot be null.");
		c.mAsyncChannel.sendMessage(REQUEST_DISCOVERY_STATE, 0, c.putListener(listener));
		}

		/**
		* Request network info.
		*
		* <p> This method provides the network info in the form of a {@link android.net.NetworkInfo}.
		* {@link android.net.NetworkInfo#isAvailable()} indicates the p2p availability and
		* {@link android.net.NetworkInfo#getDetailedState()} reports the current fine-grained state
		* of the network. This {@link android.net.NetworkInfo} is returned using the
		* {@link #NetworkInfoListener} listener.
		*
		* <p> This information is also included in the {@link #WIFI_P2P_CONNECTION_CHANGED_ACTION}
		* broadcast event with extra {@link #EXTRA_NETWORK_INFO}.
		*
		* @param c is the channel created at {@link #initialize}.
		* @param listener for callback when network info is available..
		*/
		public void requestNetworkInfo(@NonNull Channel c,
		@NonNull NetworkInfoListener listener) {
		checkChannel(c);
		if (listener == null) throw new IllegalArgumentException("This listener cannot be null.");
		c.mAsyncChannel.sendMessage(REQUEST_NETWORK_INFO, 0, c.putListener(listener));
		}
		}