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

Commit e1197e37 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Jakub Pawłowski
Browse files

Get rid of delay_bonding_when_busy flag 

Test: mma -j32
Bug: 316927319
Fix: 316927319
Flag: exempt, flag removal
Change-Id: I30ee1b8b1edc8b80d79bc88e81b000566a0d4d45
parent 556335f0

android/app/src/com/android/bluetooth/btservice/BondStateMachine.java

+1 −3
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import com.android.bluetooth.a2dp.A2dpService; 
import com.android.bluetooth.a2dpsink.A2dpSinkService;

import com.android.bluetooth.btservice.RemoteDevices.DeviceProperties;

import com.android.bluetooth.csip.CsipSetCoordinatorService;

import com.android.bluetooth.flags.Flags;

import com.android.bluetooth.hap.HapClientService;

import com.android.bluetooth.hfp.HeadsetService;

import com.android.bluetooth.hfpclient.HeadsetClientService;
@@ -149,8 +148,7 @@ final class BondStateMachine extends StateMachine { 
                    next pairing is started while previous still makes service discovery, it

                    would fail. Check the busy status of BTIF instead, and wait with starting

                    the bond. */

                    if (Flags.delayBondingWhenBusy()

                            && mAdapterService.getNative().pairingIsBusy()) {

                    if (mAdapterService.getNative().pairingIsBusy()) {

                        short retry_no =

                                (msg.getData() != null)

                                        ? msg.getData().getShort(DELAY_RETRY_COUNT)

flags/leaudio.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -73,13 +73,6 @@ flag { 
    bug: "316005152"

}



flag {

    name: "delay_bonding_when_busy"

    namespace: "bluetooth"

    description: "Fix bonding failure due to native stack being busy"

    bug: "316927319"

}



flag {

    name: "le_audio_fast_bond_params"

    namespace: "bluetooth"