diff options
| author | Dan Harms <danharms@google.com> | 2019-09-01 14:59:54 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-01 14:59:54 -0700 |
| commit | 6006a30059aa7891f82da489e32331626ec4e804 (patch) | |
| tree | 5e421fa551549aa72fcb278918c25db44a0b22d1 | |
| parent | 8b5e298f910f12ea664927b02d07fb19cde3e0de (diff) | |
| parent | ac413db40085b2ae7f5764967d465f0e22ca91d5 (diff) | |
| download | base-6006a30059aa7891f82da489e32331626ec4e804.tar.gz | |
Merge "Include BLE<->SPP transition states in isLeEnabled"
am: ac413db400
Change-Id: I15a67ad7b277b345b96f2a7cf852554ed6fee267
| -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); } /** |