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

Commit a5211154 authored by tim peng's avatar tim peng Committed by Android (Google) Code Review
Browse files

Merge "Add getConnectableDevices() to read A2DP & HearingAid devices on all states"

parents 73f1091c e54887bd

packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java

+36 −5
Original line number Diff line number Diff line
@@ -108,14 +108,45 @@ public class A2dpProfile implements LocalBluetoothProfile { 
        return true;

    }



    /**

     * Get A2dp devices matching connection states{

     * @code BluetoothProfile.STATE_CONNECTED,

     * @code BluetoothProfile.STATE_CONNECTING,

     * @code BluetoothProfile.STATE_DISCONNECTING}

     *

     * @return Matching device list

     */

    public List<BluetoothDevice> getConnectedDevices() {

        if (mService == null) return new ArrayList<BluetoothDevice>(0);

        return mService.getDevicesMatchingConnectionStates(

              new int[] {BluetoothProfile.STATE_CONNECTED,

        return getDevicesByStates(new int[] {

                BluetoothProfile.STATE_CONNECTED,

                BluetoothProfile.STATE_CONNECTING,

                BluetoothProfile.STATE_DISCONNECTING});

    }



    /**

     * Get A2dp devices matching connection states{

     * @code BluetoothProfile.STATE_DISCONNECTED,

     * @code BluetoothProfile.STATE_CONNECTED,

     * @code BluetoothProfile.STATE_CONNECTING,

     * @code BluetoothProfile.STATE_DISCONNECTING}

     *

     * @return Matching device list

     */

    public List<BluetoothDevice> getConnectableDevices() {

        return getDevicesByStates(new int[] {

                BluetoothProfile.STATE_DISCONNECTED,

                BluetoothProfile.STATE_CONNECTED,

                BluetoothProfile.STATE_CONNECTING,

                BluetoothProfile.STATE_DISCONNECTING});

    }



    private List<BluetoothDevice> getDevicesByStates(int[] states) {

        if (mService == null) {

            return new ArrayList<BluetoothDevice>(0);

        }

        return mService.getDevicesMatchingConnectionStates(states);

    }



    public boolean connect(BluetoothDevice device) {

        if (mService == null) return false;

        return mService.connect(device);

packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java

+36 −5
Original line number Diff line number Diff line
@@ -106,14 +106,45 @@ public class HearingAidProfile implements LocalBluetoothProfile { 
        return true;

    }



    /**

     * Get Hearing Aid devices matching connection states{

     * @code BluetoothProfile.STATE_CONNECTED,

     * @code BluetoothProfile.STATE_CONNECTING,

     * @code BluetoothProfile.STATE_DISCONNECTING}

     *

     * @return Matching device list

     */

    public List<BluetoothDevice> getConnectedDevices() {

        if (mService == null) return new ArrayList<BluetoothDevice>(0);

        return mService.getDevicesMatchingConnectionStates(

              new int[] {BluetoothProfile.STATE_CONNECTED,

        return getDevicesByStates(new int[] {

                BluetoothProfile.STATE_CONNECTED,

                BluetoothProfile.STATE_CONNECTING,

                BluetoothProfile.STATE_DISCONNECTING});

    }



    /**

     * Get Hearing Aid devices matching connection states{

     * @code BluetoothProfile.STATE_DISCONNECTED,

     * @code BluetoothProfile.STATE_CONNECTED,

     * @code BluetoothProfile.STATE_CONNECTING,

     * @code BluetoothProfile.STATE_DISCONNECTING}

     *

     * @return Matching device list

     */

    public List<BluetoothDevice> getConnectableDevices() {

        return getDevicesByStates(new int[] {

                BluetoothProfile.STATE_DISCONNECTED,

                BluetoothProfile.STATE_CONNECTED,

                BluetoothProfile.STATE_CONNECTING,

                BluetoothProfile.STATE_DISCONNECTING});

    }



    private List<BluetoothDevice> getDevicesByStates(int[] states) {

        if (mService == null) {

            return new ArrayList<BluetoothDevice>(0);

        }

        return mService.getDevicesMatchingConnectionStates(states);

    }



    public boolean connect(BluetoothDevice device) {

        if (mService == null) return false;

        return mService.connect(device);