Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fac43ea authored by Łukasz Rymanowski's avatar Łukasz Rymanowski
Browse files

SettingLib: Fix possible issue on bonding to second device 

If device.createBond() fails, SettingLib might stay in wrong state.

Bug: 261646456
Test: compile
Change-Id: I99cf32a475ef32a2605e4f379ec956ba288a055f
parent b4838aa9

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java

+4 −1
Original line number Diff line number Diff line
@@ -383,7 +383,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) {