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

Commit ebc2e8b9 authored by Henri Chataing's avatar Henri Chataing
Browse files

Flags 24Q4: Remove the flag avdtp_error_codes 

Bug: 338139069
Test: m com.android.btservices
Flag: com.android.bluetooth.flags.avdtp_error_codes
Change-Id: I358fc43145e1b310ac4eb3b4c22b21d77d346bc7
parent 0cb205b6

android/pandora/server/configs/pts_bot_tests_config.json

+0 −9
Original line number Diff line number Diff line
@@ -3214,15 +3214,6 @@ 
    }

  },

  "flags": [

    {

      "flags": [

        "avdtp_error_codes"

      ],

      "tests": [

        "A2DP/SNK/AVP",

        "A2DP/SRC/AVP"

      ]

    },

    {

      "flags": [

        "leaudio_allow_leaudio_only_devices",

flags/a2dp.aconfig

+0 −10
Original line number Diff line number Diff line 
package: "com.android.bluetooth.flags"

container: "com.android.btservices"



flag {

    name: "avdtp_error_codes"

    namespace: "bluetooth"

    description: "Use compliant error codes in AVDTP responses"

    bug: "338139069"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "bta_av_use_peer_codec"

    namespace: "bluetooth"

system/bta/av/bta_av_aact.cc

+0 −5
Original line number Diff line number Diff line
@@ -1782,11 +1782,6 @@ void bta_av_setconfig_rej(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
  log::info("sep_idx={} avdt_handle={} bta_handle=0x{:x} err_code=0x{:x}", p_scb->sep_idx,

            p_scb->avdt_handle, p_scb->hndl, err_code);



  if (!com::android::bluetooth::flags::avdtp_error_codes()) {

    bta_av_adjust_seps_idx(p_scb, avdt_handle);

    err_code = AVDT_ERR_UNSUP_CFG;

  }



  // The error code might not be set when the configuration is rejected

  // based on the current AVDTP state.

  if (err_code == AVDT_SUCCESS) {

system/stack/avdt/avdt_scb_act.cc

+3 −4
Original line number Diff line number Diff line
@@ -570,9 +570,8 @@ void avdt_scb_hdl_setconfig_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data) { 
  // the codec type differs from the type of the SEP, or INVALID_CODEC_TYPE

  // if the codec type does not match the values defined by Assigned Numbers.

  if (local_codec_type != remote_codec_type) {

    p_data->msg.hdr.err_code =

            !com::android::bluetooth::flags::avdtp_error_codes() ? AVDTP_UNSUPPORTED_CONFIGURATION

            : !A2DP_IsCodecTypeValid(remote_codec_type)          ? A2DP_INVALID_CODEC_TYPE

    p_data->msg.hdr.err_code = !A2DP_IsCodecTypeValid(remote_codec_type)

                                       ? A2DP_INVALID_CODEC_TYPE

                                       : A2DP_NOT_SUPPORTED_CODEC_TYPE;

    p_data->msg.hdr.err_param = 0;

    avdt_msg_send_rej(avdt_ccb_by_idx(p_data->msg.hdr.ccb_idx), p_data->msg.hdr.sig_id,