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

Commit 490c0629 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge changes I55a4a443,Iaec8d9d4,I30ee1b8b into main am: d3857d88 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3124895



Change-Id: I2710e137b4a1c3722979db3e5c9f6f7aa67b5ca5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1786668f d3857d88

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/gap.aconfig

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

}



flag {

    name: "le_scan_parameters_fix"

    namespace: "bluetooth"

    description: "Fix LE scan parameters downgrade during inquiry"

    bug: "316885813"

}



flag {

    name: "le_scan_fix_remote_exception"

    namespace: "bluetooth"

flags/leaudio.aconfig

+0 −14
Original line number Diff line number Diff line
@@ -73,20 +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"

    description: "Faster LE Audio devices connection"

    bug: "319405267"

}



flag {

    name: "le_audio_dev_type_detection_fix"

    namespace: "bluetooth"

system/bta/le_audio/client.cc

+1 −4
Original line number Diff line number Diff line
@@ -3286,10 +3286,7 @@ class LeAudioClientImpl : public LeAudioClient { 
        "{},  {}", leAudioDevice->address_,

        bluetooth::common::ToString(leAudioDevice->GetConnectionState()));



    if (com::android::bluetooth::flags::le_audio_fast_bond_params()) {

      L2CA_LockBleConnParamsForProfileConnection(leAudioDevice->address_,

                                                 false);

    }

    L2CA_LockBleConnParamsForProfileConnection(leAudioDevice->address_, false);



    if (leAudioDevice->GetConnectionState() ==

            DeviceConnectState::CONNECTED_BY_USER_GETTING_READY &&

system/btif/src/btif_dm.cc

+2 −4
Original line number Diff line number Diff line
@@ -1900,8 +1900,7 @@ void btif_on_gatt_results(RawAddress bd_addr, BD_NAME bd_name, 
        pairing_cb = {};

      }



      if (com::android::bluetooth::flags::le_audio_fast_bond_params() &&

          lea_supported) {

      if (lea_supported) {

        /* LE Audio profile should relax parameters when it connects. If

         * profile is not enabled, relax parameters after timeout. */

        log::debug("Scheduling conn params unlock for {}", bd_addr);
@@ -2442,8 +2441,7 @@ void btif_dm_acl_evt(tBTA_DM_ACL_EVT event, tBTA_DM_ACL* p_data) { 
              : bt_conn_direction_t::BT_CONN_DIRECTION_INCOMING,

          p_data->link_up.acl_handle);



      if (com::android::bluetooth::flags::le_audio_fast_bond_params() &&

          p_data->link_up.transport_link_type == BT_TRANSPORT_LE &&

      if (p_data->link_up.transport_link_type == BT_TRANSPORT_LE &&

          pairing_cb.bd_addr == bd_addr &&

          is_device_le_audio_capable(bd_addr)) {

        L2CA_LockBleConnParamsForProfileConnection(bd_addr, true);