Merge " SettingLib: Fix possible issue on bonding to second device" into tm-qpr-dev am: 7723413b0a am: 1b68989109

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20833220

Change-Id: Ib2453e7bcf47428da44d085848c148dff87aceb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-01-04 23:19:18 +00:00
committed by Automerger Merge Worker

View File

@@ -390,7 +390,10 @@ public class CachedBluetoothDeviceManager {
Log.d(TAG, "Bond " + device.getAnonymizedAddress() + " by CSIP");
mOngoingSetMemberPair = device;
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) {