Merge " SettingLib: Fix possible issue on bonding to second device" into tm-qpr-dev

This commit is contained in:
TreeHugger Robot
2023-01-04 22:17:46 +00:00
committed by Android (Google) Code Review

View File

@@ -383,7 +383,10 @@ public class CachedBluetoothDeviceManager {
Log.d(TAG, "Bond " + device.getAnonymizedAddress() + " by CSIP"); Log.d(TAG, "Bond " + device.getAnonymizedAddress() + " by CSIP");
mOngoingSetMemberPair = device; mOngoingSetMemberPair = device;
syncConfigFromMainDevice(device, groupId); syncConfigFromMainDevice(device, groupId);
device.createBond(BluetoothDevice.TRANSPORT_LE); if (!device.createBond(BluetoothDevice.TRANSPORT_LE)) {
Log.d(TAG, "Bonding could not be started");
mOngoingSetMemberPair = null;
}
} }
private void syncConfigFromMainDevice(BluetoothDevice device, int groupId) { private void syncConfigFromMainDevice(BluetoothDevice device, int groupId) {