am 4c0ff2c7: Merge "Fix bug where car dock sometimes doesn\'t connect." into gingerbread

Merge commit '4c0ff2c7b5138c0fce6c83f6c414204e32ac96f3' into gingerbread-plus-aosp

* commit '4c0ff2c7b5138c0fce6c83f6c414204e32ac96f3':
  Fix bug where car dock sometimes doesn't connect.
This commit is contained in:
Jake Hamby
2010-10-11 13:07:09 -07:00
committed by Android Git Automerger

View File

@@ -237,9 +237,9 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
}
/*package*/ void onBondingDockConnect() {
// Don't connect just set the timer.
// TODO(): Fix the actual problem
mConnectAttempted = SystemClock.elapsedRealtime();
// Attempt to connect if UUIDs are available. Otherwise,
// we will connect when the ACTION_UUID intent arrives.
connect();
}
private void connectWithoutResettingTimer() {