PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3681cfb8: am 613549a6: Merge change I2c3621d1 into eclair

Browse Source 
Merge commit '3681cfb83b0e9d02c71330fda25edaaf17bb0ba6' into eclair-mr2-plus-aosp

* commit '3681cfb83b0e9d02c71330fda25edaaf17bb0ba6':
  Fix desk dock getting stuck after unpairing.
This commit is contained in:
Jaikumar Ganesh
2009-12-10 18:07:43 -08:00
committed by Android Git Automerger
parent dcfb0dfee1 3681cfb83b
commit 1aeebabfd3
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/bluetooth/CachedBluetoothDevice.java
View File

@@ -383,6 +383,12 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
connectWithoutResettingTimer(); connectWithoutResettingTimer();
} }
/*package*/ void onBondingDockConnect() {
// Don't connect just set the timer.
// TODO(): Fix the actual problem
mConnectAttempted = SystemClock.elapsedRealtime();
}
private void connectWithoutResettingTimer() { private void connectWithoutResettingTimer() {
// Try to initialize the profiles if there were not. // Try to initialize the profiles if there were not.
if (mProfiles.size() == 0) { if (mProfiles.size() == 0) {

4
src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
View File

@@ -186,7 +186,11 @@ public class CachedBluetoothDeviceManager {
if (bondState == BluetoothDevice.BOND_BONDED) { if (bondState == BluetoothDevice.BOND_BONDED) {
// Auto-connect after pairing // Auto-connect after pairing
if (!device.isBluetoothDock()) {
cachedDevice.connect(); cachedDevice.connect();
} else {
cachedDevice.onBondingDockConnect();
}
} }
} }