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.
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
index 53e599d..c917dbc 100644
--- a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
@@ -240,9 +240,9 @@
}
/*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() {