summaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothSocket.java
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2013-10-02 07:56:46 -0700
committerMike Lockwood <lockwood@google.com>2013-10-02 07:56:46 -0700
commit9cffff7bd584bf1a49298dc645aa640f2c989a54 (patch)
tree90bd36d13643ebbcada07db8a260f438d280bcaa /framework/java/android/bluetooth/BluetoothSocket.java
parent4b707768a2a68f12fec8c7a664e88829604ef409 (diff)
Revert "Allow L2CAP sockets"
This reverts commit 008ce9e07b5e58c5ab31c5d73ec3d1ad1a6cf605.
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothSocket.java')
-rw-r--r--framework/java/android/bluetooth/BluetoothSocket.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/framework/java/android/bluetooth/BluetoothSocket.java b/framework/java/android/bluetooth/BluetoothSocket.java
index 191bf67af3..d10eaea2fb 100644
--- a/framework/java/android/bluetooth/BluetoothSocket.java
+++ b/framework/java/android/bluetooth/BluetoothSocket.java
@@ -103,8 +103,6 @@ public final class BluetoothSocket implements Closeable {
/*package*/ static final int SEC_FLAG_ENCRYPT = 1;
/*package*/ static final int SEC_FLAG_AUTH = 1 << 1;
- /*package*/ static final int PORT_MASK_FIXED_CHAN = 1 << 16;
-
private final int mType; /* one of TYPE_RFCOMM etc */
private BluetoothDevice mDevice; /* remote device */
private String mAddress; /* remote address */
@@ -117,7 +115,7 @@ public final class BluetoothSocket implements Closeable {
private LocalSocket mSocket;
private InputStream mSocketIS;
private OutputStream mSocketOS;
- private int mPort; /* RFCOMM channel or L2CAP psm/channel */
+ private int mPort; /* RFCOMM channel or L2CAP psm */
private int mFd;
private String mServiceName;
private static int PROXY_CONNECTION_TIMEOUT = 5000;