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

Merge "Connect other profiles when priority is auto connect." into honeycomb

Browse Source
This commit is contained in:
Jaikumar Ganesh
2011-01-21 21:24:49 -08:00
committed by Android (Google) Code Review
parent acf36126e4 a8d18865a4
commit 8db58ea52c
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,6 +82,7 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine
public static final int TRANSITION_TO_STABLE = 102; public static final int TRANSITION_TO_STABLE = 102;
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 CONNECT_OTHER_PROFILES_DELAY = 4000; // 4 secs private static final int CONNECT_OTHER_PROFILES_DELAY = 4000; // 4 secs
private BondedDevice mBondedDevice = new BondedDevice(); private BondedDevice mBondedDevice = new BondedDevice();
@@ -1010,8 +1011,9 @@ 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.getPriority(mDevice) == BluetoothProfile.PRIORITY_ON ||
if (mA2dpService.getPriority(mDevice) == BluetoothProfile.PRIORITY_ON) { mA2dpService.getPriority(mDevice) ==
BluetoothProfile.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;
@@ -1023,7 +1025,9 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine
// 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 != null && if (mHeadsetService != null &&
mHeadsetService.getPriority(mDevice) == BluetoothProfile.PRIORITY_ON) { (mHeadsetService.getPriority(mDevice) == BluetoothProfile.PRIORITY_ON ||
mHeadsetService.getPriority(mDevice) ==
BluetoothProfile.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;