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

Merge commit 'd7f7213af27fa6c5e476bb8a8d2951feb5e630b5'

* commit 'd7f7213af27fa6c5e476bb8a8d2951feb5e630b5':
  Fix bug where car dock sometimes doesn't connect.
This commit is contained in:
Jake Hamby
2010-10-12 13:18:21 -07:00
committed by Android Git Automerger

View File

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