diff options
| author | Dan Harms <danharms@google.com> | 2019-08-06 09:18:02 -0700 |
|---|---|---|
| committer | Dan Harms <danharms@google.com> | 2019-08-07 08:48:04 -0700 |
| commit | 2d7e1873d10cd53256754ecc2c4ab8401db0316e (patch) | |
| tree | 3e433a797be7ff67a517c9e17f7ea41098666f24 /core/java/android/bluetooth/BluetoothAdapter.java | |
| parent | cbdb10f982320a8363beb338324c26d2ca9f064f (diff) | |
Include BLE<->SPP transition states in isLeEnabled
Fixes: 138997297
Test: Start scan while in transition and observe no exceptions
Change-Id: Ib8b05c30c3db8e398194572a179028647e703a9f
Diffstat (limited to 'core/java/android/bluetooth/BluetoothAdapter.java')
| -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); } /** |