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

Commit 1b689891 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I9145937f4bc7459311054239b41e79dd66f2cb91
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0fc8f1f0 7723413b

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) {