diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-18 21:48:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-18 22:13:02 +0200 |
| commit | 5391a325eadcee86a494aa96a3f8edae1be55556 (patch) | |
| tree | bf1fac1ecfc8721084850f70b7e98a825c0a2515 /src/android | |
| parent | 60d27ebd2977eee384461469053755c6ba36f102 (diff) | |
| parent | 519ac44fbbeed7ab74fc1f733fcf9057075d0946 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta3
Conflicts:
src/bluetooth/qbluetoothsocket_bluez.cpp
Change-Id: I37e21b3c636a241a357bc81fc23da51303b94623
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java b/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java index cb7b2dc9..59ed0992 100644 --- a/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java +++ b/src/android/bluetooth/src/org/qtproject/qt5/android/bluetooth/QtBluetoothLE.java @@ -187,8 +187,8 @@ public class QtBluetoothLE { switch (status) { case BluetoothGatt.GATT_SUCCESS: errorCode = 0; break; //QLowEnergyController::NoError - case 8: // link loss - case 22: // BTA_GATT_CONN_LMP_TIMEOUT + case 8: // BLE_HCI_CONNECTION_TIMEOUT + case 22: // BLE_HCI_LOCAL_HOST_TERMINATED_CONNECTION Log.w(TAG, "Connection Error: Try to delay connect() call after previous activity"); errorCode = 5; break; //QLowEnergyController::ConnectionError default: |