diff options
| author | 2019-09-03 15:12:03 -0700 | |
|---|---|---|
| committer | 2019-09-03 15:12:03 -0700 | |
| commit | 13203bc682425c021d34fda424fdffcc7a6ea68b (patch) | |
| tree | ace19f9098293c67333ca68a834c30fcf6b713c5 | |
| parent | c688d8e2d724c1c0d1c9453cfdf7bb24ada56a82 (diff) | |
| parent | a41c8ce633fa5cd769e34500dfb5506357d491cf (diff) | |
Merge "Include BLE<->SPP transition states in isLeEnabled" am: ac413db400 am: 6006a30059 am: f0d6b4ee4d am: 003872a765
am: a41c8ce633
Change-Id: I448b8475b1e862afc38a9ddba8a45d74a0275fb5
| -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); } /** |