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

Commit 11b97c50 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I551ed729 into eclair 

* changes:
  Use UNDEFINED priorities when unpaired.
parents 87ed10d7 551ed729

core/java/android/bluetooth/BluetoothA2dp.java

+2 −0
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ public final class BluetoothA2dp { 
    /** Default priority for a2dp devices that should not allow incoming

     * connections */

    public static final int PRIORITY_OFF = 0;

    /** Default priority when not set or when the device is unpaired */

    public static final int PRIORITY_UNDEFINED = -1;



    private final IBluetoothA2dp mService;

    private final Context mContext;

core/java/android/bluetooth/BluetoothHeadset.java

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,8 @@ public final class BluetoothHeadset { 
    /** Default priority for headsets that should not be auto-connected

     * and not allow incoming connections. */

    public static final int PRIORITY_OFF = 0;

    /** Default priority when not set or when the device is unpaired */

    public static final int PRIORITY_UNDEFINED = -1;



    /** The voice dialer 'works' but the user experience is poor. The voice

     *  recognizer has trouble dealing with the 8kHz SCO signal, and it still

core/java/android/server/BluetoothA2dpService.java

+4 −2
Original line number Diff line number Diff line
@@ -96,11 +96,13 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub { 
                                                   BluetoothDevice.ERROR);

                switch(bondState) {

                case BluetoothDevice.BOND_BONDED:

                    if (getSinkPriority(device) == BluetoothA2dp.PRIORITY_UNDEFINED) {

                        setSinkPriority(device, BluetoothA2dp.PRIORITY_ON);

                    }

                    break;

                case BluetoothDevice.BOND_BONDING:

                case BluetoothDevice.BOND_NONE:

                    setSinkPriority(device, BluetoothA2dp.PRIORITY_OFF);

                    setSinkPriority(device, BluetoothA2dp.PRIORITY_UNDEFINED);

                    break;

                }

            } else if (action.equals(BluetoothDevice.ACTION_ACL_CONNECTED)) {