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

Commit 861e863e authored by Jack He's avatar Jack He Committed by android-build-merger
Browse files

Merge "Bluetooth: Use enums for adapter connection states" am: 95372e873e 

am: af0b065e

Change-Id: I7e0ed2b7a0b67bb443b9e104a7985e3a9bed96ff
parents 4402ff48 af0b065e

framework/java/android/bluetooth/BluetoothAdapter.java

+5 −4
Original line number Diff line number Diff line
@@ -541,13 +541,14 @@ public final class BluetoothAdapter { 
            "android.bluetooth.adapter.action.BLE_ACL_DISCONNECTED";



    /** The profile is in disconnected state */

    public static final int STATE_DISCONNECTED = 0;

    public static final int STATE_DISCONNECTED = BluetoothProtoEnums.CONNECTION_STATE_DISCONNECTED;

    /** The profile is in connecting state */

    public static final int STATE_CONNECTING = 1;

    public static final int STATE_CONNECTING = BluetoothProtoEnums.CONNECTION_STATE_CONNECTING;

    /** The profile is in connected state */

    public static final int STATE_CONNECTED = 2;

    public static final int STATE_CONNECTED = BluetoothProtoEnums.CONNECTION_STATE_CONNECTED;

    /** The profile is in disconnecting state */

    public static final int STATE_DISCONNECTING = 3;

    public static final int STATE_DISCONNECTING =

            BluetoothProtoEnums.CONNECTION_STATE_DISCONNECTING;



    /** @hide */

    public static final String BLUETOOTH_MANAGER_SERVICE = "bluetooth_manager";