diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java index a7fae1441f9..c8078938b6d 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java @@ -79,7 +79,7 @@ public class BluetoothDetailsButtonsController extends BluetoothDetailsControlle .setButton2Text(R.string.bluetooth_device_context_connect) .setButton2Icon(R.drawable.ic_add_24dp) .setButton2OnClickListener( - view -> mCachedDevice.connect(true /* connectAllProfiles */)); + view -> mCachedDevice.connect()); mConnectButtonInitialized = true; } } diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java index a8b1c97f2e8..42267205d81 100644 --- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java +++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java @@ -241,7 +241,7 @@ public final class BluetoothDevicePreference extends GearPreference implements } else if (bondState == BluetoothDevice.BOND_BONDED) { metricsFeatureProvider.action(context, SettingsEnums.ACTION_SETTINGS_BLUETOOTH_CONNECT); - mCachedDevice.connect(true); + mCachedDevice.connect(); } else if (bondState == BluetoothDevice.BOND_NONE) { metricsFeatureProvider.action(context, SettingsEnums.ACTION_SETTINGS_BLUETOOTH_PAIR); diff --git a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java index 8d91dfcabe8..fdd7a1e853a 100644 --- a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java @@ -57,7 +57,7 @@ public class SavedBluetoothDeviceUpdater extends BluetoothDeviceUpdater mMetricsFeatureProvider.logClickedPreference(preference, mFragment.getMetricsCategory()); final CachedBluetoothDevice device = ((BluetoothDevicePreference) preference) .getBluetoothDevice(); - device.connect(true); + device.connect(); return true; } diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java index eaa4c3cc968..f52685c3ec1 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java @@ -22,7 +22,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -103,7 +102,7 @@ public class BluetoothDetailsButtonsControllerTest extends BluetoothDetailsContr verify(mButtonsPref).setButton2Text(R.string.bluetooth_device_context_connect); mConnectButton.callOnClick(); - verify(mCachedDevice).connect(eq(true)); + verify(mCachedDevice).connect(); } @Test @@ -119,7 +118,7 @@ public class BluetoothDetailsButtonsControllerTest extends BluetoothDetailsContr // Click the button and make sure that connect (not disconnect) gets called. mConnectButton.callOnClick(); - verify(mCachedDevice).connect(eq(true)); + verify(mCachedDevice).connect(); } @Test diff --git a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java index 4cc9b87cb2c..d329f5c5f63 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java @@ -122,6 +122,6 @@ public class SavedBluetoothDeviceUpdaterTest { public void onClick_Preference_setConnect() { mBluetoothDeviceUpdater.onPreferenceClick(mPreference); - verify(mCachedBluetoothDevice).connect(true); + verify(mCachedBluetoothDevice).connect(); } }