Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b':
  Do Not Merge Connect other profiles when priority is auto connect.
This commit is contained in:
Jaikumar Ganesh
2011-01-21 21:36:32 -08:00
committed by Android Git Automerger
parent 3cc8a3a47e 1c9761e30d
commit f643974954
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/bluetooth/BluetoothDeviceProfileState.java
View File

@@ -75,6 +75,7 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine
public static final int CONNECT_OTHER_PROFILES = 103; public static final int CONNECT_OTHER_PROFILES = 103;
private static final int AUTO_CONNECT_DELAY = 6000; // 6 secs 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 BondedDevice mBondedDevice = new BondedDevice();
private OutgoingHandsfree mOutgoingHandsfree = new OutgoingHandsfree(); private OutgoingHandsfree mOutgoingHandsfree = new OutgoingHandsfree();
@@ -765,23 +766,26 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine
case CONNECT_HFP_INCOMING: case CONNECT_HFP_INCOMING:
// Connect A2DP if there is no incoming connection // Connect A2DP if there is no incoming connection
// If the priority is OFF - don't auto connect. // 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(); Message msg = new Message();
msg.what = CONNECT_OTHER_PROFILES; msg.what = CONNECT_OTHER_PROFILES;
msg.arg1 = CONNECT_A2DP_OUTGOING; msg.arg1 = CONNECT_A2DP_OUTGOING;
sendMessageDelayed(msg, AUTO_CONNECT_DELAY); sendMessageDelayed(msg, CONNECT_OTHER_PROFILES_DELAY);
} }
break; break;
case CONNECT_A2DP_INCOMING: case CONNECT_A2DP_INCOMING:
// This is again against spec. HFP incoming connections should be made // This is again against spec. HFP incoming connections should be made
// before A2DP, so we should not hit this case. But many devices // before A2DP, so we should not hit this case. But many devices
// don't follow this. // 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(); Message msg = new Message();
msg.what = CONNECT_OTHER_PROFILES; msg.what = CONNECT_OTHER_PROFILES;
msg.arg1 = CONNECT_HFP_OUTGOING; msg.arg1 = CONNECT_HFP_OUTGOING;
sendMessageDelayed(msg, AUTO_CONNECT_DELAY); sendMessageDelayed(msg, CONNECT_OTHER_PROFILES_DELAY);
} }
break; break;
default: default: