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

Commit 4dd601cc authored by Myles Watson's avatar Myles Watson
Browse files

InitFlags: Remove sco_codec_timer_clear 

Bug: 265582589
Fixes: 290846293
Test: mma -j32
Flag: EXEMPT, no logical change
Change-Id: I3d789736b73039645ce25fb5ec36a742d9bd6aa3
parent fd138a95

system/bta/ag/bta_ag_sco.cc

+0 −13
Original line number Diff line number Diff line
@@ -32,12 +32,9 @@ 
#include "bta/ag/bta_ag_int.h"

#include "bta_ag_swb_aptx.h"

#include "btm_status.h"

#include "common/init_flags.h"

#include "hci/controller_interface.h"

#include "internal_include/bt_target.h"

#include "internal_include/bt_trace.h"

#include "main/shim/entry.h"

#include "os/logging/log_adapter.h"

#include "osi/include/properties.h"

#include "stack/btm/btm_int_types.h"

#include "stack/btm/btm_sco.h"
@@ -819,16 +816,6 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -210,7 +210,6 @@ init_flags!( 
        classic_discovery_only,

        dynamic_avrcp_version_enhancement = true,

        hci_adapter: i32,

        sco_codec_timeout_clear,

        sdp_serialization = true,

        sdp_skip_rnr_if_known = true,

        set_min_encryption = true,

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

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

        fn dynamic_avrcp_version_enhancement_is_enabled() -> bool;

        fn get_hci_adapter() -> i32;

        fn sco_codec_timeout_clear_is_enabled() -> bool;

        fn sdp_serialization_is_enabled() -> bool;

        fn sdp_skip_rnr_if_known_is_enabled() -> bool;

        fn set_min_encryption_is_enabled() -> bool;