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

Commit af5672d4 authored by Yuyang Huang's avatar Yuyang Huang Committed by Automerger Merge Worker
Browse files

Merge "Remove use_dsp_codec_when_controller_does_not_support flag" into main am: ab192b16 

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



Change-Id: I7f2cd308500acd130e9419ebd4605cf8a07bdf9e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f8199c8d ab192b16

flags/hfp.aconfig

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

}



flag {

    name: "use_dsp_codec_when_controller_does_not_support"

    namespace: "bluetooth"

    description: "use codec on the DSP when the BT controller does not support it"

    bug: "308838380"

}



flag {

    name: "is_sco_managed_by_audio"

    namespace: "bluetooth"

system/device/src/esco_parameters.cc

+16 −18
Original line number Diff line number Diff line
@@ -371,8 +371,7 @@ enh_esco_params_t esco_parameters_for_codec(esco_codec_t codec, bool offload) { 
                   ESCO_NUM_CODECS);



  std::vector<uint8_t> codecIds;

  if (com::android::bluetooth::flags::

          use_dsp_codec_when_controller_does_not_support()) {



  auto controller = bluetooth::shim::GetController();

  if (controller == nullptr) {

    log::warn("controller is null");
@@ -391,7 +390,6 @@ enh_esco_params_t esco_parameters_for_codec(esco_codec_t codec, bool offload) { 
      }

    }

  }

  }



  if (offload) {

    if (codec == ESCO_CODEC_SWB_Q0 || codec == ESCO_CODEC_SWB_Q1 ||