am c8f42fb6: Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread

* commit 'c8f42fb69867f171c04013b1b1a8f7e897ae3685':
  DO NOT MERGE: Remove auto connection on ACL connection.
This commit is contained in:
Jaikumar Ganesh
2011-01-12 13:58:17 -08:00
committed by Android Git Automerger

View File

@ -129,10 +129,6 @@ public final class BluetoothDeviceProfileState extends HierarchicalStateMachine
newState == BluetoothA2dp.STATE_DISCONNECTED) {
sendMessage(TRANSITION_TO_STABLE);
}
} else if (action.equals(BluetoothDevice.ACTION_ACL_CONNECTED)) {
Message msg = new Message();
msg.what = AUTO_CONNECT_PROFILES;
sendMessageDelayed(msg, AUTO_CONNECT_DELAY);
} else if (action.equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)) {
// This is technically not needed, but we can get stuck sometimes.
// For example, if incoming A2DP fails, we are not informed by Bluez