commit 85ed086217427308c3b2df5b4ba77fa5ae7326e6
author Android (Google) Code Review <android-gerrit@google.com> Thu Oct 01 14:35:13 2009 -0400
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 01 14:35:13 2009 -0400
tree 44ad7cc21dfdd428525a1d89e98f42038853a722
parent 9767612cc8207f906173dc9459b45cd07d881c4e
parent 454a0dbf8ff6d638e4ad31e30007bf3099a509cc

Merge change I454a0dbf into eclair

* changes:
  SecuritySettings: revert "minor tuning".

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 380c484..25c7f14 100644
--- a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
@@ -396,11 +396,13 @@
 
         int preferredProfiles = 0;
         for (Profile profile : mProfiles) {
-            LocalBluetoothProfileManager profileManager =
-                    LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile);
-            if (profileManager.isPreferred(mDevice)) {
-                ++preferredProfiles;
-                queueCommand(new BluetoothJob(BluetoothCommand.CONNECT, this, profile));
+            if (isConnectableProfile(profile)) {
+                LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
+                        .getProfileManager(mLocalManager, profile);
+                if (profileManager.isPreferred(mDevice)) {
+                    ++preferredProfiles;
+                    queueCommand(new BluetoothJob(BluetoothCommand.CONNECT, this, profile));
+                }
             }
         }
         if (DEBUG) Log.d(TAG, "Preferred profiles = " + preferredProfiles);
@@ -417,10 +419,12 @@
         mIsConnectingErrorPossible = true;
 
         for (Profile profile : mProfiles) {
-            LocalBluetoothProfileManager profileManager =
-                    LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile);
-            profileManager.setPreferred(mDevice, false);
-            queueCommand(new BluetoothJob(BluetoothCommand.CONNECT, this, profile));
+            if (isConnectableProfile(profile)) {
+                LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
+                        .getProfileManager(mLocalManager, profile);
+                profileManager.setPreferred(mDevice, false);
+                queueCommand(new BluetoothJob(BluetoothCommand.CONNECT, this, profile));
+            }
         }
     }