b/2318290 connect should be called instead of connect(profile) if device is unpaired. (d8eec52a) · Commits · e / os / android_packages_apps_Settings

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

+9 −4

Original line number	Diff line number	Diff line
		@@ -459,19 +459,19 @@ public class DockService extends Service implements AlertDialog.OnMultiChoiceCli

		mPendingDevice = null;

		boolean callConnect = false;
		CachedBluetoothDevice cachedDevice = getCachedBluetoothDevice(mContext, mBtManager,
		device);
		for (int i = 0; i < mProfiles.length; i++) {
		LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
		.getProfileManager(mBtManager, mProfiles[i]);
		boolean isConnected = profileManager.isConnected(device);
		CachedBluetoothDevice cachedDevice = getCachedBluetoothDevice(mContext, mBtManager,
		device);

		if (DEBUG) Log.d(TAG, mProfiles[i].toString() + " = " + mCheckedItems[i]);

		if (mCheckedItems[i] && !isConnected) {
		// Checked but not connected
		if (DEBUG) Log.d(TAG, "applyBtSettings - Connecting");
		cachedDevice.connect(mProfiles[i]);
		callConnect = true;
		} else if (!mCheckedItems[i] && isConnected) {
		// Unchecked but connected
		if (DEBUG) Log.d(TAG, "applyBtSettings - Disconnecting");
		@@ -484,6 +484,11 @@ public class DockService extends Service implements AlertDialog.OnMultiChoiceCli
		}
		}
		}

		if (callConnect) {
		if (DEBUG) Log.d(TAG, "applyBtSettings - Connecting");
		cachedDevice.connect();
		}
		}

		void handleUndocked(Context context, LocalBluetoothManager localManager,