Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove listenUsingEncryptedRfcommOn & listenUsingScoOn" am: 22399aae26 am: e32671c74d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404838

Change-Id: Idcfc40762221d456374fdf7ee3f96123a137a793
This commit is contained in:
Zach Johnson
2020-08-20 02:44:09 +00:00
committed by Automerger Merge Worker
parent 2206e69609 e32671c74d
commit dc08329ee9
1 changed files with 0 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
core/java/android/bluetooth/BluetoothAdapter.java
View File

@@ -2639,52 +2639,6 @@ public final class BluetoothAdapter {
return socket;
}
/**
* Construct an encrypted, RFCOMM server socket.
* Call #accept to retrieve connections to this socket.
*
* @return An RFCOMM BluetoothServerSocket
* @throws IOException On error, for example Bluetooth not available, or insufficient
* permissions.
* @hide
*/
public BluetoothServerSocket listenUsingEncryptedRfcommOn(int port) throws IOException {
BluetoothServerSocket socket =
new BluetoothServerSocket(BluetoothSocket.TYPE_RFCOMM, false, true, port);
int errno = socket.mSocket.bindListen();
if (port == SOCKET_CHANNEL_AUTO_STATIC_NO_SDP) {
socket.setChannel(socket.mSocket.getPort());
}
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 a SCO server socket.
* Call #accept to retrieve connections to this socket.
*
* @return A SCO BluetoothServerSocket
* @throws IOException On error, for example Bluetooth not available, or insufficient
* permissions.
* @hide
*/
public static BluetoothServerSocket listenUsingScoOn() throws IOException {
BluetoothServerSocket socket =
new BluetoothServerSocket(BluetoothSocket.TYPE_SCO, false, false, -1);
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);
}
return socket;
}
/**
* Construct an encrypted, authenticated, L2CAP server socket.
* Call #accept to retrieve connections to this socket.