diff options
| author | 2019-09-01 15:18:39 -0700 | |
|---|---|---|
| committer | 2019-09-01 15:18:39 -0700 | |
| commit | 003872a765cc994353a23afcee7167269ac98bf9 (patch) | |
| tree | 701f69eeec5c2316c277eebb6fff94c22e0077bb | |
| parent | 52ed298efb372856a7113e133c5e4715e0749225 (diff) | |
| parent | f0d6b4ee4d1d8ecc1915380723c835b58d469a6f (diff) | |
Merge "Include BLE<->SPP transition states in isLeEnabled" am: ac413db400 am: 6006a30059
am: f0d6b4ee4d
Change-Id: Ibb956238a3296a5971aa5fb47880a0a41939b2ae
| -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); } /** |