Bluetooth: Introduce custom APIs for L2cap socket for Obex over L2cap (3a038c1e) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothAdapter.java

+76 −0

Original line number	Diff line number	Diff line
		@@ -1112,6 +1112,34 @@ public final class BluetoothAdapter {
		return createNewRfcommSocketAndRecord(name, uuid, true, true);
		}

		/**
		* Create a listening, secure L2CAP Bluetooth socket with Service Record.
		* <p>A remote device connecting to this socket will be authenticated and
		* communication on this socket will be encrypted.
		* <p>Use {@link BluetoothServerSocket#accept} to retrieve incoming
		* connections from a listening {@link BluetoothServerSocket}.
		* <p>The system will assign an unused L2CAP PSM to listen on.
		* <p>The system will also register a Service Discovery
		* Protocol (SDP) record with the local SDP server containing the specified
		* UUID, service name, and auto-assigned PSM number. Remote Bluetooth devices
		* can use the same UUID to query our SDP server and discover which PSM
		* to connect to. This SDP record will be removed when this socket is
		* closed, or if this application closes unexpectedly.
		* <p>Use {@link BluetoothDevice#createL2capSocketToServiceRecord} to
		* connect to this socket from another device using the same {@link UUID}.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
		* @param name service name for SDP record
		* @param uuid uuid for SDP record
		* @return a listening L2CAP BluetoothServerSocket
		* @throws IOException on error, for example Bluetooth not available, or
		* insufficient permissions, or channel in use.
		* @hide
		*/
		public BluetoothServerSocket listenUsingL2capWithServiceRecord(String name, UUID uuid)
		throws IOException {
		return createNewL2capSocketAndRecord(name, uuid, true, true);
		}

		/**
		* Create a listening, insecure RFCOMM Bluetooth socket with Service Record.
		* <p>The link key is not required to be authenticated, i.e the communication may be
		@@ -1143,6 +1171,38 @@ public final class BluetoothAdapter {
		return createNewRfcommSocketAndRecord(name, uuid, false, false);
		}

		/**
		* Create a listening, insecure L2CAP Bluetooth socket with Service Record.
		* <p>The link key is not required to be authenticated, i.e the communication may be
		* vulnerable to Man In the Middle attacks. For Bluetooth 2.1 devices,
		* the link will be encrypted, as encryption is mandartory.
		* For legacy devices (pre Bluetooth 2.1 devices) the link will not
		* be encrypted. Use {@link #listenUsingL2capWithServiceRecord}, if an
		* encrypted and authenticated communication channel is desired.
		* <p>Use {@link BluetoothServerSocket#accept} to retrieve incoming
		* connections from a listening {@link BluetoothServerSocket}.
		* <p>The system will assign an unused L2CAP PSM to listen on.
		* <p>The system will also register a Service Discovery
		* Protocol (SDP) record with the local SDP server containing the specified
		* UUID, service name, and auto-assigned PSM number. Remote Bluetooth devices
		* can use the same UUID to query our SDP server and discover which PSM
		* to connect to. This SDP record will be removed when this socket is
		* closed, or if this application closes unexpectedly.
		* <p>Use {@link BluetoothDevice#createL2capSocketToServiceRecord} to
		* connect to this socket from another device using the same {@link UUID}.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
		* @param name service name for SDP record
		* @param uuid uuid for SDP record
		* @return a listening L2CAP BluetoothServerSocket
		* @throws IOException on error, for example Bluetooth not available, or
		* insufficient permissions, or channel in use.
		* @hide
		*/
		public BluetoothServerSocket listenUsingInsecureL2capWithServiceRecord(String name, UUID uuid)
		throws IOException {
		return createNewL2capSocketAndRecord(name, uuid, false, false);
		}

		/**
		* Create a listening, encrypted,
		* RFCOMM Bluetooth socket with Service Record.
		@@ -1198,6 +1258,22 @@ public final class BluetoothAdapter {
		return socket;
		}

		private BluetoothServerSocket createNewL2capSocketAndRecord(String name, UUID uuid,
		boolean auth, boolean encrypt) throws IOException {
		BluetoothServerSocket socket;
		socket = new BluetoothServerSocket(BluetoothSocket.TYPE_L2CAP, auth,
		encrypt, new ParcelUuid(uuid));
		socket.setServiceName(name);
		int errno = socket.mSocket.bindListen();
		if (errno != 0) {
		//TODO(BT): Throw the same exception error code
		// that the previous code was using.
		//socket.mSocket.throwErrnoNative(errno);
		throw new IOException("Error: " + errno);
		}
		return socket;
		}

		/**
		* Construct an unencrypted, unauthenticated, RFCOMM server socket.
		* Call #accept to retrieve connections to this socket.

core/java/android/bluetooth/BluetoothDevice.java

+58 −0

Original line number	Diff line number	Diff line
		@@ -1264,6 +1264,33 @@ public final class BluetoothDevice implements Parcelable {
		new ParcelUuid(uuid));
		}

		/**
		* Create an L2CAP {@link BluetoothSocket} ready to start a secure
		* outgoing connection to this remote device using SDP lookup of uuid.
		* <p>This is designed to be used with {@link
		* BluetoothAdapter#listenUsingL2capWithServiceRecord} for peer-peer
		* Bluetooth applications.
		* <p>Use {@link BluetoothSocket#connect} to initiate the outgoing
		* connection. This will also perform an SDP lookup of the given uuid to
		* determine which channel to connect to.
		* <p>The remote device will be authenticated and communication on this
		* socket will be encrypted.
		* <p> Use this socket only if an authenticated socket link is possible.
		* Authentication refers to the authentication of the link key to
		* prevent man-in-the-middle type of attacks.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
		*
		* @param uuid service record uuid to lookup L2CAP PSM
		* @return a L2CAP BluetoothServerSocket ready for an outgoing connection
		* @throws IOException on error, for example Bluetooth not available, or
		* insufficient permissions
		* @hide
		*/
		public BluetoothSocket createL2capSocketToServiceRecord(UUID uuid) throws IOException {
		return new BluetoothSocket(BluetoothSocket.TYPE_L2CAP, -1, true, true, this, -1,
		new ParcelUuid(uuid));
		}

		/**
		* Create an RFCOMM {@link BluetoothSocket} socket ready to start an insecure
		* outgoing connection to this remote device using SDP lookup of uuid.
		@@ -1297,6 +1324,37 @@ public final class BluetoothDevice implements Parcelable {
		new ParcelUuid(uuid));
		}

		/**
		* Create an L2CAP {@link BluetoothSocket} socket ready to start an insecure
		* outgoing connection to this remote device using SDP lookup of uuid.
		* <p> The communication channel will not have an authenticated link key
		* i.e it will be subject to man-in-the-middle attacks. For Bluetooth 2.1
		* devices, the link key will be encrypted, as encryption is mandatory.
		* For legacy devices (pre Bluetooth 2.1 devices) the link key will
		* be not be encrypted. Use {@link #createL2capSocketToServiceRecord} if an
		* encrypted and authenticated communication channel is desired.
		* <p>This is designed to be used with {@link
		* BluetoothAdapter#listenUsingInsecureL2capWithServiceRecord} for peer-peer
		* Bluetooth applications.
		* <p>Use {@link BluetoothSocket#connect} to initiate the outgoing
		* connection. This will also perform an SDP lookup of the given uuid to
		* determine which l2cap psm to connect to.
		* <p>The remote device will be authenticated and communication on this
		* socket will be encrypted.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
		*
		* @param uuid service record uuid to lookup L2CAP PSM
		* @return a L2CAP BluetoothServerSocket ready for an outgoing connection
		* @throws IOException on error, for example Bluetooth not available, or
		* insufficient permissions
		* @hide
		*/
		public BluetoothSocket createInsecureL2capSocketToServiceRecord(UUID uuid) throws IOException {
		return new BluetoothSocket(BluetoothSocket.TYPE_L2CAP, -1, false, false, this, -1,
		new ParcelUuid(uuid));
		}


		/**
		* Construct an insecure RFCOMM socket ready to start an outgoing
		* connection.