Added new rfcomm multi accept code (3b147b77) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothAdapter.java

+27 −122

Original line number	Diff line number	Diff line
		@@ -847,51 +847,6 @@ public final class BluetoothAdapter {
		return BluetoothProfile.STATE_DISCONNECTED;
		}

		/**
		/**
		* Picks RFCOMM channels until none are left.
		* Avoids reserved channels.
		*/
		private static class RfcommChannelPicker {
		private static final int[] RESERVED_RFCOMM_CHANNELS = new int[] {
		10, // HFAG
		11, // HSAG
		12, // OPUSH
		19, // PBAP
		};
		private static LinkedList<Integer> sChannels; // master list of non-reserved channels
		private static Random sRandom;

		private final LinkedList<Integer> mChannels; // local list of channels left to try

		private final UUID mUuid;

		public RfcommChannelPicker(UUID uuid) {
		synchronized (RfcommChannelPicker.class) {
		if (sChannels == null) {
		// lazy initialization of non-reserved rfcomm channels
		sChannels = new LinkedList<Integer>();
		for (int i = 1; i <= BluetoothSocket.MAX_RFCOMM_CHANNEL; i++) {
		sChannels.addLast(new Integer(i));
		}
		for (int reserved : RESERVED_RFCOMM_CHANNELS) {
		sChannels.remove(new Integer(reserved));
		}
		sRandom = new Random();
		}
		mChannels = (LinkedList<Integer>)sChannels.clone();
		}
		mUuid = uuid;
		}
		/* Returns next random channel, or -1 if we're out */
		public int nextChannel() {
		if (mChannels.size() == 0) {
		return -1;
		}
		return mChannels.remove(sRandom.nextInt(mChannels.size()));
		}
		}

		/**
		* Create a listening, secure RFCOMM Bluetooth socket.
		* <p>A remote device connecting to this socket will be authenticated and
		@@ -911,10 +866,10 @@ public final class BluetoothAdapter {
		BluetoothSocket.TYPE_RFCOMM, true, true, channel);
		int errno = socket.mSocket.bindListen();
		if (errno != 0) {
		try {
		socket.close();
		} catch (IOException e) {}
		socket.mSocket.throwErrnoNative(errno);
		//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;
		}
		@@ -1015,72 +970,23 @@ public final class BluetoothAdapter {
		return createNewRfcommSocketAndRecord(name, uuid, false, true);
		}


		private BluetoothServerSocket createNewRfcommSocketAndRecord(String name, UUID uuid,
		boolean auth, boolean encrypt) throws IOException {
		RfcommChannelPicker picker = new RfcommChannelPicker(uuid);
		BluetoothServerSocket socket;
		int channel;
		int errno;
		while (true) {
		channel = picker.nextChannel();

		if (channel == -1) {
		throw new IOException("No available channels");
		}

		socket = new BluetoothServerSocket(
		BluetoothSocket.TYPE_RFCOMM, auth, encrypt, channel);
		errno = socket.mSocket.bindListen();
		if (errno == 0) {
		if (DBG) Log.d(TAG, "listening on RFCOMM channel " + channel);
		break; // success
		} else if (errno == BluetoothSocket.EADDRINUSE) {
		if (DBG) Log.d(TAG, "RFCOMM channel " + channel + " in use");
		try {
		socket.close();
		} catch (IOException e) {}
		continue; // try another channel
		} else {
		try {
		socket.close();
		} catch (IOException e) {}
		socket.mSocket.throwErrnoNative(errno); // Exception as a result of bindListen()
		}
		}

		int handle = -1;
		//TODO(BT):
		/*try {
		handle = mService.addRfcommServiceRecord(name, new ParcelUuid(uuid), channel,
		new Binder());
		} catch (RemoteException e) {Log.e(TAG, "", e);}*/
		if (handle == -1) {
		try {
		socket.close();
		} catch (IOException e) {}
		throw new IOException("Not able to register SDP record for " + name);
		}

		if (mServiceRecordHandler == null) {
		mServiceRecordHandler = new Handler(Looper.getMainLooper()) {
		public void handleMessage(Message msg) {
		/* handle socket closing */
		int handle = msg.what;
		// TODO(BT):
		/*
		try {
		if (DBG) Log.d(TAG, "Removing service record " +
		Integer.toHexString(handle));
		} catch (RemoteException e) {Log.e(TAG, "", e);}
		*/
		}
		};
		socket = new BluetoothServerSocket(BluetoothSocket.TYPE_RFCOMM, 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);
		}
		socket.setCloseHandler(mServiceRecordHandler, handle);
		return socket;
		}


		/**
		* Construct an unencrypted, unauthenticated, RFCOMM server socket.
		* Call #accept to retrieve connections to this socket.
		@@ -1094,10 +1000,10 @@ public final class BluetoothAdapter {
		BluetoothSocket.TYPE_RFCOMM, false, false, port);
		int errno = socket.mSocket.bindListen();
		if (errno != 0) {
		try {
		socket.close();
		} catch (IOException e) {}
		socket.mSocket.throwErrnoNative(errno);
		//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;
		}
		@@ -1115,11 +1021,11 @@ public final class BluetoothAdapter {
		BluetoothServerSocket socket = new BluetoothServerSocket(
		BluetoothSocket.TYPE_RFCOMM, false, true, port);
		int errno = socket.mSocket.bindListen();
		if (errno != 0) {
		try {
		socket.close();
		} catch (IOException e) {}
		socket.mSocket.throwErrnoNative(errno);
		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;
		}
		@@ -1136,11 +1042,10 @@ public final class BluetoothAdapter {
		BluetoothServerSocket socket = new BluetoothServerSocket(
		BluetoothSocket.TYPE_SCO, false, false, -1);
		int errno = socket.mSocket.bindListen();
		if (errno != 0) {
		try {
		socket.close();
		} catch (IOException e) {}
		socket.mSocket.throwErrnoNative(errno);
		if (errno < 0) {
		//TODO(BT): Throw the same exception error code
		// that the previous code was using.
		//socket.mSocket.throwErrnoNative(errno);
		}
		return socket;
		}

core/java/android/bluetooth/BluetoothServerSocket.java

+21 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@
		package android.bluetooth;

		import android.os.Handler;
		import android.os.Message;
		import android.os.ParcelUuid;

		import java.io.Closeable;
		import java.io.IOException;
		@@ -85,6 +87,22 @@ public final class BluetoothServerSocket implements Closeable {
		mSocket = new BluetoothSocket(type, -1, auth, encrypt, null, port, null);
		}

		/**
		* Construct a socket for incoming connections.
		* @param type type of socket
		* @param auth require the remote device to be authenticated
		* @param encrypt require the connection to be encrypted
		* @param uuid uuid
		* @throws IOException On error, for example Bluetooth not available, or
		* insufficient privileges
		*/
		/package/ BluetoothServerSocket(int type, boolean auth, boolean encrypt, ParcelUuid uuid)
		throws IOException {
		mSocket = new BluetoothSocket(type, -1, auth, encrypt, null, -1, uuid);
		mChannel = mSocket.getPort();
		}


		/**
		* Block until a connection is established.
		* <p>Returns a connected {@link BluetoothSocket} on successful connection.
		@@ -133,7 +151,9 @@ public final class BluetoothServerSocket implements Closeable {
		mHandler = handler;
		mMessage = message;
		}

		/package/ void setServiceName(String ServiceName) {
		mSocket.setServiceName(ServiceName);
		}
		/**
		* Returns the channel on which this socket is bound.
		* @hide

core/java/android/bluetooth/BluetoothSocket.java

+281 −220

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/bluetooth/IBluetooth.aidl

+4 −0

Original line number	Diff line number	Diff line
		@@ -73,4 +73,8 @@ interface IBluetooth
		boolean setPairingConfirmation(in BluetoothDevice device, boolean accept);

		void sendConnectionStateChange(in BluetoothDevice device, int profile, int state, int prevState);

		// For Socket
		ParcelFileDescriptor connectSocket(in BluetoothDevice device, int type, in ParcelUuid uuid, int port, int flag);
		ParcelFileDescriptor createSocketChannel(int type, in String serviceName, in ParcelUuid uuid, int port, int flag);
		}

core/java/android/net/LocalSocket.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,15 @@ public class LocalSocket {
		isBound = false;
		isConnected = false;
		}
		/**
		* Creates a AF_LOCAL/UNIX domain stream socket with FileDescriptor.
		* @hide
		*/
		public LocalSocket(FileDescriptor fd) throws IOException {
		this(new LocalSocketImpl(fd));
		isBound = true;
		isConnected = true;
		}

		/**
		* for use with AndroidServerSocket