Don't auto connect reverse tethering after pairing.

Added boolean param to connect() method in CachedBluetoothDevice
to specify whether to connect PAN profile. This is set to true when
the user clicks on a device in the paired devices list, but false
when auto connecting profiles after pairing and other circumstances.

Bug: 3330207
Change-Id: I6d8d50abb65a8cb24f87ad93c01693923991b6ef
This commit is contained in:
Jake Hamby
2011-01-06 21:01:30 -08:00
parent 586fa0264c
commit 4bd7cb0e07
2 changed files with 7 additions and 7 deletions

View File

@@ -140,7 +140,7 @@ class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
if (isConnected()) {
askDisconnect();
} else if (bondState == BluetoothDevice.BOND_BONDED) {
connect();
connect(true);
} else if (bondState == BluetoothDevice.BOND_NONE) {
pair();
}
@@ -264,18 +264,18 @@ class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
super.finalize();
}
public void connect() {
public void connect(boolean connectAllProfiles) {
if (!ensurePaired()) return;
mConnectAttempted = SystemClock.elapsedRealtime();
connectWithoutResettingTimer(true);
connectWithoutResettingTimer(connectAllProfiles);
}
/*package*/ void onBondingDockConnect() {
// Attempt to connect if UUIDs are available. Otherwise,
// we will connect when the ACTION_UUID intent arrives.
connect();
connect(false);
}
private void connectWithoutResettingTimer(boolean connectAllProfiles) {
@@ -646,7 +646,7 @@ class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
if (mDevice.isBluetoothDock()) {
onBondingDockConnect();
} else if (mConnectAfterPairing) {
connect();
connect(false);
}
mConnectAfterPairing = false;
}

View File

@@ -663,7 +663,7 @@ public class DockService extends Service implements AlertDialog.OnMultiChoiceCli
}
if (profileManager.getPreferred(device) == auto) {
cachedDevice.connect();
cachedDevice.connect(false);
break;
}
}
@@ -735,7 +735,7 @@ public class DockService extends Service implements AlertDialog.OnMultiChoiceCli
if (callConnect) {
if (DEBUG) Log.d(TAG, "applyBtSettings - Connecting");
cachedDevice.connect();
cachedDevice.connect(false);
}
}