diff options
| author | 2019-09-01 21:45:21 +0000 | |
|---|---|---|
| committer | 2019-09-01 21:45:21 +0000 | |
| commit | ac413db40085b2ae7f5764967d465f0e22ca91d5 (patch) | |
| tree | 1fae2c040347bda8c18633cd7fa7c1609a33dfe1 | |
| parent | b28fac6edd6cfdb651d71080b2ccf14cd75802e0 (diff) | |
| parent | 2d7e1873d10cd53256754ecc2c4ab8401db0316e (diff) | |
Merge "Include BLE<->SPP transition states in isLeEnabled"
| -rw-r--r-- | core/java/android/bluetooth/BluetoothAdapter.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index 39d63de87da3..e7ba85ad5d9e 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -858,7 +858,10 @@ public final class BluetoothAdapter { if (DBG) { Log.d(TAG, "isLeEnabled(): " + BluetoothAdapter.nameForState(state)); } - return (state == BluetoothAdapter.STATE_ON || state == BluetoothAdapter.STATE_BLE_ON); + return (state == BluetoothAdapter.STATE_ON + || state == BluetoothAdapter.STATE_BLE_ON + || state == BluetoothAdapter.STATE_TURNING_ON + || state == BluetoothAdapter.STATE_TURNING_OFF); } /** |