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

Commit cdf62b28 authored by Etienne Ruffieux's avatar Etienne Ruffieux
Browse files

Handle codec negotiation failed. 

If the codec negotiation fails, we never reset current scb
which results in stack being in BTA_AG_SCO_LISTEN_ST and
new connections transfered instead of opened.
As transfers are ignored in listen state, no sco could be
opened until the first device failing negotiation was
disconnected.

Handling the BTA_AG_SCO_CLOSE_E (result of a negotiation
failed) in order to remove the current scb and let other
devices open sco.

There are no current tests for the SCO state machine, so
keeping this change behind a flag until then.

Bug: 265582589
Tag: #feature
Test: Manual, forced codec nego timeout. Behind a flag.
Change-Id: Ic73cc0d44a5d966e4353012f170d5a664799074c
parent 90fa6840

system/bta/ag/bta_ag_sco.cc

+10 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "bt_target.h"  // Must be first to define build configuration

#include "bt_trace.h"   // Legacy trace logging

#include "bta/ag/bta_ag_int.h"

#include "common/init_flags.h"

#include "device/include/controller.h"

#include "main/shim/dumpsys.h"

#include "osi/include/log.h"
@@ -766,6 +767,15 @@ static void bta_ag_sco_event(tBTA_AG_SCB* p_scb, uint8_t event) { 
          break;



        case BTA_AG_SCO_CLOSE_E:

          if (bluetooth::common::init_flags::

                  sco_codec_timeout_clear_is_enabled()) {

            /* remove listening connection */

            bta_ag_remove_sco(p_scb, false);



            if (p_scb == p_sco->p_curr_scb) p_sco->p_curr_scb = nullptr;



            bta_ag_create_sco(p_scb, false);

          }

          /* sco open is not started yet. just go back to listening */

          p_sco->state = BTA_AG_SCO_LISTEN_ST;

          break;

system/gd/rust/common/src/init_flags.rs

+1 −0
Original line number Diff line number Diff line
@@ -391,6 +391,7 @@ init_flags!( 
        read_encryption_key_size = true,

        redact_log = true,

        rust_event_loop = true,

        sco_codec_timeout_clear,

        sdp_serialization = true,

        sdp_skip_rnr_if_known = true,

        bluetooth_quality_report_callback = true,

system/gd/rust/shim/src/init_flags.rs

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ mod ffi { 
        fn read_encryption_key_size_is_enabled() -> bool;

        fn redact_log_is_enabled() -> bool;

        fn rust_event_loop_is_enabled() -> bool;

        fn sco_codec_timeout_clear_is_enabled() -> bool;

        fn sdp_serialization_is_enabled() -> bool;

        fn sdp_skip_rnr_if_known_is_enabled() -> bool;

        fn bluetooth_quality_report_callback_is_enabled() -> bool;