diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-11 07:44:36 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-11 07:44:46 +0100 |
| commit | 3264db95f965a47f31ffe1ab768467ce827e41e9 (patch) | |
| tree | 43235b62d755f1961de895e5b121362c54c33683 /src/bluetooth/android | |
| parent | 515ccffb8d56b42c89e9c2c04abe0ef2619ece4e (diff) | |
| parent | b398e069ca8bd01ba7ca67781b7ca21402ffdbbe (diff) | |
Merge remote-tracking branch 'gerrit/5.4' into dev
Change-Id: Ia70c3fe64e2ffcb27181bf912b06e6af59d2bc92
Diffstat (limited to 'src/bluetooth/android')
| -rw-r--r-- | src/bluetooth/android/localdevicebroadcastreceiver.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bluetooth/android/localdevicebroadcastreceiver.cpp b/src/bluetooth/android/localdevicebroadcastreceiver.cpp index c54c5e32..a3b92252 100644 --- a/src/bluetooth/android/localdevicebroadcastreceiver.cpp +++ b/src/bluetooth/android/localdevicebroadcastreceiver.cpp @@ -50,8 +50,8 @@ LocalDeviceBroadcastReceiver::LocalDeviceBroadcastReceiver(QObject *parent) : addAction(valueForStaticField(JavaNames::BluetoothAdapter, JavaNames::ActionScanModeChanged)); addAction(valueForStaticField(JavaNames::BluetoothDevice, JavaNames::ActionAclConnected)); addAction(valueForStaticField(JavaNames::BluetoothDevice, JavaNames::ActionAclDisconnected)); - if (QtAndroidPrivate::androidSdkVersion() >= 19) - addAction(valueForStaticField(JavaNames::BluetoothDevice, JavaNames::ActionPairingRequest)); //API 19 + if (QtAndroidPrivate::androidSdkVersion() >= 15) + addAction(valueForStaticField(JavaNames::BluetoothDevice, JavaNames::ActionPairingRequest)); //API 15 //cache integer values for host & bonding mode //don't use the java fields directly but refer to them by name |