Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13203bc6 authored by Dan Harms's avatar Dan Harms Committed by android-build-merger
Browse files

Merge "Include BLE<->SPP transition states in isLeEnabled" am: ac413db4 am:... 

Merge "Include BLE<->SPP transition states in isLeEnabled" am: ac413db4 am: 6006a300 am: f0d6b4ee am: 003872a7
am: a41c8ce6

Change-Id: I448b8475b1e862afc38a9ddba8a45d74a0275fb5
parents c688d8e2 a41c8ce6

core/java/android/bluetooth/BluetoothAdapter.java

+4 −1
Original line number Diff line number Diff line
@@ -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);

    }



    /**