summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/qbluetoothsocket_android.cpp
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2014-10-10 14:41:59 +0200
committerAlex Blasche <alexander.blasche@digia.com>2014-10-13 09:31:28 +0200
commitfa7615b4e98ec7319e6a264c2a6686949037f6bd (patch)
tree54931c510fd78cea5a40d5db6e2eb4197b4f02b3 /src/bluetooth/qbluetoothsocket_android.cpp
parent0a3b0177116fd0033c315968e7a3d559ad043c5d (diff)
Fix QBluetoothSocket::isReadable()/isOpen()/isWritable()
Change-Id: Ifd6b5ed8176aa7959ed8da0edc762266aa2bd6fa Task-number: QTBUG-32704 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/bluetooth/qbluetoothsocket_android.cpp')
-rw-r--r--src/bluetooth/qbluetoothsocket_android.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothsocket_android.cpp b/src/bluetooth/qbluetoothsocket_android.cpp
index ce68d236..4faf2f19 100644
--- a/src/bluetooth/qbluetoothsocket_android.cpp
+++ b/src/bluetooth/qbluetoothsocket_android.cpp
@@ -331,6 +331,9 @@ void QBluetoothSocketPrivate::connectToServiceConc(const QBluetoothAddress &addr
return;
}
+ // only unbuffered behavior supported at this stage
+ q->setOpenMode(QIODevice::ReadWrite|QIODevice::Unbuffered);
+
q->setSocketState(QBluetoothSocket::ConnectedState);
emit q->connected();
}
@@ -494,6 +497,7 @@ void QBluetoothSocketPrivate::inputThreadError(int errorCode)
}
q->setSocketState(QBluetoothSocket::UnconnectedState);
+ q->setOpenMode(QIODevice::NotOpen);
emit q->disconnected();
}
@@ -569,7 +573,7 @@ bool QBluetoothSocketPrivate::setSocketDescriptor(const QAndroidJniObject &socke
q->setSocketState(socketState);
- q->setOpenMode(openMode);
+ q->setOpenMode(openMode | QIODevice::Unbuffered);
if (openMode == QBluetoothSocket::ConnectedState)
emit q->connected();