Merge "interface for nfc handover supplicant commands" (d96e4948) · Commits · e / os / android_frameworks_base

core/res/AndroidManifest.xml

+14 −4

Original line number	Diff line number	Diff line
		@@ -156,16 +156,12 @@
		android:name="android.bluetooth.pan.profile.action.CONNECTION_STATE_CHANGED" />
		<protected-broadcast android:name="android.bluetooth.pbap.intent.action.PBAP_STATE_CHANGED" />
		<protected-broadcast android:name="android.btopp.intent.action.INCOMING_FILE_NOTIFICATION" />
		<protected-broadcast android:name="android.btopp.intent.action.BT_OPP_HANDOVER_STARTED" />
		<protected-broadcast android:name="android.btopp.intent.action.TRANSFER_COMPLETE" />
		<protected-broadcast android:name="android.btopp.intent.action.USER_CONFIRMATION_TIMEOUT" />
		<protected-broadcast android:name="android.btopp.intent.action.BT_OPP_TRANSFER_PROGRESS" />
		<protected-broadcast android:name="android.btopp.intent.action.LIST" />
		<protected-broadcast android:name="android.btopp.intent.action.OPEN_OUTBOUND" />
		<protected-broadcast android:name="android.btopp.intent.action.HIDE_COMPLETE" />
		<protected-broadcast android:name="android.btopp.intent.action.CONFIRM" />
		<protected-broadcast android:name="android.btopp.intent.action.HIDE" />
		<protected-broadcast android:name="android.btopp.intent.action.BT_OPP_TRANSFER_DONE" />
		<protected-broadcast android:name="android.btopp.intent.action.RETRY" />
		<protected-broadcast android:name="android.btopp.intent.action.OPEN" />
		<protected-broadcast android:name="android.btopp.intent.action.OPEN_INBOUND" />
		@@ -284,7 +280,13 @@
		<protected-broadcast
		android:name="android.intent.action.PERMISSION_RESPONSE_RECEIVED" />
		<!-- Defined in RestrictionsManager -->

		<protected-broadcast android:name="android.intent.action.REQUEST_PERMISSION" />
		<protected-broadcast android:name="android.nfc.handover.intent.action.HANDOVER_STARTED" />
		<protected-broadcast android:name="android.nfc.handover.intent.action.TRANSFER_DONE" />
		<protected-broadcast android:name="android.nfc.handover.intent.action.TRANSFER_PROGRESS" />
		<protected-broadcast android:name="android.nfc.handover.intent.action.TRANSFER_DONE" />


		<!-- ====================================== -->
		<!-- Permissions for things that cost money -->
		@@ -877,6 +879,14 @@
		android:permissionGroup="android.permission-group.NETWORK"
		android:protectionLevel="signature\|system" />

		<!-- Allows sending and receiving handover transfer status from Wifi and Bluetooth
		@hide
		-->
		<permission android:name="android.permission.NFC_HANDOVER_STATUS"
		android:label="@string/permlab_handoverStatus"
		android:description="@string/permdesc_handoverStatus"
		android:protectionLevel="signature\|system" />

		<!-- ================================== -->
		<!-- Permissions for accessing accounts -->
		<!-- ================================== -->

core/res/res/values/strings.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -2137,6 +2137,9 @@
		<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
		<string name="permdesc_accessDrmCertificates">Allows an application to provision and use DRM certficates. Should never be needed for normal apps.</string>

		<string name="permlab_handoverStatus">Receive handover transfer broadcasts.</string>
		<string name="permdesc_handoverStatus">Allows receiving handover transfer status information.</string>

		<!-- Policy administration -->

		<!-- Title of policy access to limiting the user's password choices -->

services/core/java/com/android/server/am/ActivityManagerService.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -13959,6 +13959,8 @@ public final class ActivityManagerService extends ActivityManagerNative

		// Make sure that the user who is receiving this broadcast is started.
		// If not, we will just skip it.


		if (userId != UserHandle.USER_ALL && mStartedUsers.get(userId) == null) {
		if (callingUid != Process.SYSTEM_UID \|\| (intent.getFlags()
		& Intent.FLAG_RECEIVER_BOOT_UPGRADE) == 0) {
		@@ -13975,7 +13977,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		int callingAppId = UserHandle.getAppId(callingUid);
		if (callingAppId == Process.SYSTEM_UID \|\| callingAppId == Process.PHONE_UID
		\|\| callingAppId == Process.SHELL_UID \|\| callingAppId == Process.BLUETOOTH_UID
		\|\| callingUid == 0) {
		\|\| callingAppId == Process.NFC_UID \|\| callingUid == 0) {
		// Always okay.
		} else if (callerApp == null \|\| !callerApp.persistent) {
		try {

wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.os.Messenger;
		interface IWifiP2pManager
		{
		Messenger getMessenger();
		Messenger getP2pStateMachineMessenger();
		void setMiracastMode(int mode);
		}

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

+115 −2

Original line number	Diff line number	Diff line
		@@ -276,6 +276,13 @@ public class WifiP2pManager {
		public static final String WIFI_P2P_PERSISTENT_GROUPS_CHANGED_ACTION =
		"android.net.wifi.p2p.PERSISTENT_GROUPS_CHANGED";

		/**
		* The lookup key for a handover message returned by the WifiP2pService.
		* @hide
		*/
		public static final String EXTRA_HANDOVER_MESSAGE =
		"android.net.wifi.p2p.EXTRA_HANDOVER_MESSAGE";

		IWifiP2pManager mService;

		private static final int BASE = Protocol.BASE_WIFI_P2P_MANAGER;
		@@ -446,6 +453,21 @@ public class WifiP2pManager {
		/** @hide */
		public static final int SET_CHANNEL_SUCCEEDED = BASE + 73;

		/** @hide */
		public static final int GET_HANDOVER_REQUEST = BASE + 75;
		/** @hide */
		public static final int GET_HANDOVER_SELECT = BASE + 76;
		/** @hide */
		public static final int RESPONSE_GET_HANDOVER_MESSAGE = BASE + 77;
		/** @hide */
		public static final int INITIATOR_REPORT_NFC_HANDOVER = BASE + 78;
		/** @hide */
		public static final int RESPONDER_REPORT_NFC_HANDOVER = BASE + 79;
		/** @hide */
		public static final int REPORT_NFC_HANDOVER_SUCCEEDED = BASE + 80;
		/** @hide */
		public static final int REPORT_NFC_HANDOVER_FAILED = BASE + 81;


		/**
		* Create a new WifiP2pManager instance. Applications use
		@@ -626,6 +648,14 @@ public class WifiP2pManager {
		public void onPersistentGroupInfoAvailable(WifiP2pGroupList groups);
		}

		/**
		* Interface for callback invocation when Handover Request or Select Message is available
		* @hide
		*/
		public interface HandoverMessageListener {
		public void onHandoverMessageAvailable(String handoverMessage);
		}

		/**
		* A channel that connects the application to the Wifi p2p framework.
		* Most p2p operations require a Channel as an argument. An instance of Channel is obtained
		@@ -687,6 +717,7 @@ public class WifiP2pManager {
		case START_LISTEN_FAILED:
		case STOP_LISTEN_FAILED:
		case SET_CHANNEL_FAILED:
		case REPORT_NFC_HANDOVER_FAILED:
		if (listener != null) {
		((ActionListener) listener).onFailure(message.arg1);
		}
		@@ -712,6 +743,7 @@ public class WifiP2pManager {
		case START_LISTEN_SUCCEEDED:
		case STOP_LISTEN_SUCCEEDED:
		case SET_CHANNEL_SUCCEEDED:
		case REPORT_NFC_HANDOVER_SUCCEEDED:
		if (listener != null) {
		((ActionListener) listener).onSuccess();
		}
		@@ -745,6 +777,16 @@ public class WifiP2pManager {
		onPersistentGroupInfoAvailable(groups);
		}
		break;
		case RESPONSE_GET_HANDOVER_MESSAGE:
		Bundle handoverBundle = (Bundle) message.obj;
		if (listener != null) {
		String handoverMessage = handoverBundle != null
		? handoverBundle.getString(EXTRA_HANDOVER_MESSAGE)
		: null;
		((HandoverMessageListener) listener)
		.onHandoverMessageAvailable(handoverMessage);
		}
		break;
		default:
		Log.d(TAG, "Ignored " + message);
		break;
		@@ -841,7 +883,20 @@ public class WifiP2pManager {
		* @return Channel instance that is necessary for performing any further p2p operations
		*/
		public Channel initialize(Context srcContext, Looper srcLooper, ChannelListener listener) {
		Messenger messenger = getMessenger();
		return initalizeChannel(srcContext, srcLooper, listener, getMessenger());
		}

		/**
		* Registers the application with the Wi-Fi framework. Enables system-only functionality.
		* @hide
		*/
		public Channel initializeInternal(Context srcContext, Looper srcLooper,
		ChannelListener listener) {
		return initalizeChannel(srcContext, srcLooper, listener, getP2pStateMachineMessenger());
		}

		private Channel initalizeChannel(Context srcContext, Looper srcLooper, ChannelListener listener,
		Messenger messenger) {
		if (messenger == null) return null;

		Channel c = new Channel(srcContext, srcLooper, listener);
		@@ -1327,4 +1382,62 @@ public class WifiP2pManager {
		}
		}

		/**
		* Get a reference to P2pStateMachine handler. This is used to establish
		* a priveleged AsyncChannel communication with WifiP2pService.
		*
		* @return Messenger pointing to the WifiP2pService handler
		* @hide
		*/
		public Messenger getP2pStateMachineMessenger() {
		try {
		return mService.getP2pStateMachineMessenger();
		} catch (RemoteException e) {
		return null;
		}
		}

		/**
		* Get a handover request message for use in WFA NFC Handover transfer.
		* @hide
		*/
		public void getNfcHandoverRequest(Channel c, HandoverMessageListener listener) {
		checkChannel(c);
		c.mAsyncChannel.sendMessage(GET_HANDOVER_REQUEST, 0, c.putListener(listener));
		}


		/**
		* Get a handover select message for use in WFA NFC Handover transfer.
		* @hide
		*/
		public void getNfcHandoverSelect(Channel c, HandoverMessageListener listener) {
		checkChannel(c);
		c.mAsyncChannel.sendMessage(GET_HANDOVER_SELECT, 0, c.putListener(listener));
		}

		/**
		* @hide
		*/
		public void initiatorReportNfcHandover(Channel c, String handoverSelect,
		ActionListener listener) {
		checkChannel(c);
		Bundle bundle = new Bundle();
		bundle.putString(EXTRA_HANDOVER_MESSAGE, handoverSelect);
		c.mAsyncChannel.sendMessage(INITIATOR_REPORT_NFC_HANDOVER, 0,
		c.putListener(listener), bundle);
		}


		/**
		* @hide
		*/
		public void responderReportNfcHandover(Channel c, String handoverRequest,
		ActionListener listener) {
		checkChannel(c);
		Bundle bundle = new Bundle();
		bundle.putString(EXTRA_HANDOVER_MESSAGE, handoverRequest);
		c.mAsyncChannel.sendMessage(RESPONDER_REPORT_NFC_HANDOVER, 0,
		c.putListener(listener), bundle);
		}
		}