diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2019-09-12 11:55:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-12 12:36:07 +0200 |
| commit | 9ebd29eafed687ae19ec02aa0bd566f60377ceec (patch) | |
| tree | f70f9d0f4fae4ee369a892f71a6f323c1113cfc3 /src/bluetooth/android/localdevicebroadcastreceiver.cpp | |
| parent | 2c6dcc643f29c212fca0ead123a377e96b9a17c9 (diff) | |
| parent | c1803d266854c6f71994705133e5b2b93a060d1e (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/bluetooth/qbluetoothdevicediscoveryagent_darwin.mm
src/bluetooth/qbluetoothserver_osx.mm
src/bluetooth/qbluetoothserviceinfo_osx.mm
src/bluetooth/qbluetoothsocket_osx.mm
Change-Id: I24485ae835560fa1e57007fb684f6532db3e7922
Diffstat (limited to 'src/bluetooth/android/localdevicebroadcastreceiver.cpp')
| -rw-r--r-- | src/bluetooth/android/localdevicebroadcastreceiver.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/bluetooth/android/localdevicebroadcastreceiver.cpp b/src/bluetooth/android/localdevicebroadcastreceiver.cpp index e3b01987..78aecc12 100644 --- a/src/bluetooth/android/localdevicebroadcastreceiver.cpp +++ b/src/bluetooth/android/localdevicebroadcastreceiver.cpp @@ -189,6 +189,14 @@ void LocalDeviceBroadcastReceiver::onReceive(JNIEnv *env, jobject context, jobje return; case 0: //BluetoothDevice.PAIRING_VARIANT_PIN { + qCDebug(QT_BT_ANDROID) << "Pairing : PAIRING_VARIANT_PIN -> use Android default handling"; + + // The section below is disabled because this Android pairing variant + // requires the user to enter a pin. Since QBluetoothLocalDevice does + // not have a setPin() equivalent which might be used to return the user's value. + // For now we ignore this request. If an app ignores such requests, + // Android shows a "fall-back" pin code entry form. + /* //generate a random key const QString pin = QStringLiteral("%1").arg(QRandomGenerator::global()->bounded(1000000), 6, 10, QLatin1Char('0')); @@ -225,10 +233,12 @@ void LocalDeviceBroadcastReceiver::onReceive(JNIEnv *env, jobject context, jobje } const QBluetoothAddress address(bluetoothDevice.callObjectMethod<jstring>("getAddress").toString()); - emit pairingDisplayPinCode(address, pin); + emit pairingDisplayPinCode(address, pin);*/ + break; } case 2: //BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION { + qCDebug(QT_BT_ANDROID) << "Pairing : PAIRING_VARIANT_PASSKEY_CONFIRMATION"; keyExtra = valueForStaticField(JavaNames::BluetoothDevice, JavaNames::ExtraPairingKey); key = intentObject.callMethod<jint>("getIntExtra", |