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

Commit 1f5dc9ef authored by Benson Li's avatar Benson Li Committed by Automerger Merge Worker
Browse files

Merge "Add init_flag for SCO LC3 codec" am: afcd758d 

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



Change-Id: I5351032a7c947beba1d4d8f51dca82c6bc31966f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 65c4f3fa afcd758d

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

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

        redact_log = true,

        rust_event_loop = true,

        sco_codec_select_lc3,

        sco_codec_timeout_clear,

        sdp_serialization = true,

        sdp_skip_rnr_if_known = true,

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

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,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_select_lc3_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;

system/stack/btm/btm_sco_hfp_hal.cc

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <vector>



#include "common/init_flags.h"

#include "device/include/esco_parameters.h"

#include "osi/include/properties.h"
@@ -50,7 +51,8 @@ void init() { 
bool get_wbs_supported() { return !DISABLE_WBS; }



bool get_swb_supported() {

  return osi_property_get_bool("bluetooth.hfp.swb.supported", false);

  return osi_property_get_bool("bluetooth.hfp.swb.supported", false) &&

         bluetooth::common::init_flags::sco_codec_select_lc3_is_enabled();

}



// Checks the supported codecs