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

Commit f6439749 authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android Git Automerger
Browse files

am 1c9761e3: Merge "Do Not Merge Connect other profiles when priority is auto... 

am 1c9761e3: Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread

* commit '1c9761e3':
  Do Not Merge Connect other profiles when priority is auto connect.
parents 3cc8a3a4 1c9761e3

core/java/android/bluetooth/BluetoothDeviceProfileState.java

+9 −5
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine 
    public static final int CONNECT_OTHER_PROFILES = 103;



    private static final int AUTO_CONNECT_DELAY = 6000; // 6 secs

    private static final int CONNECT_OTHER_PROFILES_DELAY = 4000; // 4 secs



    private BondedDevice mBondedDevice = new BondedDevice();

    private OutgoingHandsfree mOutgoingHandsfree = new OutgoingHandsfree();
@@ -765,23 +766,26 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine 
            case CONNECT_HFP_INCOMING:

                // Connect A2DP if there is no incoming connection

                // If the priority is OFF - don't auto connect.

                // If the priority is AUTO_CONNECT, auto connect code takes care.

                if (mA2dpService.getSinkPriority(mDevice) == BluetoothA2dp.PRIORITY_ON) {

                if (mA2dpService.getSinkPriority(mDevice) == BluetoothA2dp.PRIORITY_ON ||

                        mA2dpService.getSinkPriority(mDevice) ==

                            BluetoothA2dp.PRIORITY_AUTO_CONNECT) {

                    Message msg = new Message();

                    msg.what = CONNECT_OTHER_PROFILES;

                    msg.arg1 = CONNECT_A2DP_OUTGOING;

                    sendMessageDelayed(msg, AUTO_CONNECT_DELAY);

                    sendMessageDelayed(msg, CONNECT_OTHER_PROFILES_DELAY);

                }

                break;

            case CONNECT_A2DP_INCOMING:

                // This is again against spec. HFP incoming connections should be made

                // before A2DP, so we should not hit this case. But many devices

                // don't follow this.

                if (mHeadsetService.getPriority(mDevice) == BluetoothHeadset.PRIORITY_ON) {

                if (mHeadsetService.getPriority(mDevice) == BluetoothHeadset.PRIORITY_ON

                        || mHeadsetService.getPriority(mDevice) ==

                            BluetoothHeadset.PRIORITY_AUTO_CONNECT) {

                    Message msg = new Message();

                    msg.what = CONNECT_OTHER_PROFILES;

                    msg.arg1 = CONNECT_HFP_OUTGOING;

                    sendMessageDelayed(msg, AUTO_CONNECT_DELAY);

                    sendMessageDelayed(msg, CONNECT_OTHER_PROFILES_DELAY);

                }

                break;

            default: