commit 99bdf2ce23cf9a48dc3d8f020b4de01da67130a5
author Jake Hamby <jhamby@google.com> Fri Jan 07 10:54:05 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 07 10:54:05 2011 -0800
tree 2785129b74d623574896abc8568a9132dd464b8b
parent 5777bd011374a9acd8183e0f4523fa9bcdea1aeb
parent 4bd7cb0e07a1fbc4e658810631132cebd5b1fdd6

Merge "Don't auto connect reverse tethering after pairing." into honeycomb

src/com/android/settings/bluetooth/CachedBluetoothDevice.java

diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
index c31f49d..46391d3 100644
--- a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
@@ -140,7 +140,7 @@
         if (isConnected()) {
             askDisconnect();
         } else if (bondState == BluetoothDevice.BOND_BONDED) {
-            connect();
+            connect(true);
         } else if (bondState == BluetoothDevice.BOND_NONE) {
             pair();
         }
@@ -264,18 +264,18 @@
         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 @@
             if (mDevice.isBluetoothDock()) {
                 onBondingDockConnect();
             } else if (mConnectAfterPairing) {
-                connect();
+                connect(false);
             }
             mConnectAfterPairing = false;
         }

src/com/android/settings/bluetooth/DockService.java

diff --git a/src/com/android/settings/bluetooth/DockService.java b/src/com/android/settings/bluetooth/DockService.java
index d165f9b..8104652 100644
--- a/src/com/android/settings/bluetooth/DockService.java
+++ b/src/com/android/settings/bluetooth/DockService.java
@@ -663,7 +663,7 @@
             }
 
             if (profileManager.getPreferred(device) == auto) {
-                cachedDevice.connect();
+                cachedDevice.connect(false);
                 break;
             }
         }
@@ -735,7 +735,7 @@
 
         if (callConnect) {
             if (DEBUG) Log.d(TAG, "applyBtSettings - Connecting");
-            cachedDevice.connect();
+            cachedDevice.connect(false);
         }
     }