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

Commit 99475486 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12212122 from 28456f82 to 24Q4-release 

Change-Id: I26f02a420df5bd7d14bfee623ba1787f7ad1c317
parents b1998d02 28456f82

system/bta/ag/bta_ag_sco.cc

+3 −3
Original line number Diff line number Diff line
@@ -1374,9 +1374,6 @@ void bta_ag_sco_conn_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& /* data */) { 
  bta_sys_sco_open(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);



  if (bta_ag_is_sco_managed_by_audio()) {

    // ConfirmStreamingRequest before sends callback to java layer

    hfp_offload_interface->ConfirmStreamingRequest();



    bool is_controller_codec = false;

    if (sco_config_map.find(p_scb->inuse_codec) == sco_config_map.end()) {

      log::error("sco_config_map does not have inuse_codec={}",
@@ -1392,6 +1389,9 @@ void bta_ag_sco_conn_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& /* data */) { 
            .is_nrec = p_scb->nrec_enabled,

    };

    hfp_offload_interface->UpdateAudioConfigToHal(config);



    // ConfirmStreamingRequest before sends callback to java layer

    hfp_offload_interface->ConfirmStreamingRequest();

  }



  /* call app callback */

system/stack/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ cc_library_static { 
    ],

    host_supported: true,

    min_sdk_version: "Tiramisu",

    cflags: ["-Wno-unused-parameter"],

}



filegroup {

system/stack/a2dp/a2dp_aac.cc

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ int A2DP_ComputeMaxBitRateAac(const uint8_t* p_codec_info, uint16_t mtu) { 
  return (8 * mtu * sampling_freq) / pcm_channel_samples_per_frame;

}



bool A2DP_GetPacketTimestampAac(const uint8_t* p_codec_info, const uint8_t* p_data,

bool A2DP_GetPacketTimestampAac(const uint8_t* /* p_codec_info */, const uint8_t* p_data,

                                uint32_t* p_timestamp) {

  // TODO: Is this function really codec-specific?

  *p_timestamp = *(const uint32_t*)p_data;

system/stack/a2dp/a2dp_codec_config.cc

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ bool A2dpCodecConfig::isCodecConfigEmpty(const btav_a2dp_codec_config_t& codec_c 
tA2DP_STATUS A2dpCodecConfig::setCodecUserConfig(

        const btav_a2dp_codec_config_t& codec_user_config,

        const btav_a2dp_codec_config_t& codec_audio_config,

        const tA2DP_ENCODER_INIT_PEER_PARAMS* p_peer_params, const uint8_t* p_peer_codec_info,

        const tA2DP_ENCODER_INIT_PEER_PARAMS* /* p_peer_params */, const uint8_t* p_peer_codec_info,

        bool is_capability, uint8_t* p_result_codec_config, bool* p_restart_input,

        bool* p_restart_output, bool* p_config_updated) {

  std::lock_guard<std::recursive_mutex> lock(codec_mutex_);

system/stack/a2dp/a2dp_ext.cc

+3 −3
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ A2dpCodecConfigExt::A2dpCodecConfigExt(btav_a2dp_codec_index_t codec_index, bool 
}



tA2DP_STATUS A2dpCodecConfigExt::setCodecConfig(const uint8_t* p_peer_codec_info,

                                                bool is_capability,

                                                uint8_t* p_result_codec_config) {

                                                bool /* is_capability */,

                                                uint8_t* /* p_result_codec_config */) {

  // Call get_a2dp_config to recompute best capabilities.

  // This method need to update codec_capability_, codec_config_,

  // and ota_codec_config_ using the local codec_user_config_, and input
@@ -72,7 +72,7 @@ tA2DP_STATUS A2dpCodecConfigExt::setCodecConfig(const uint8_t* p_peer_codec_info 
  return A2DP_SUCCESS;

}



bool A2dpCodecConfigExt::setPeerCodecCapabilities(const uint8_t* p_peer_codec_capabilities) {

bool A2dpCodecConfigExt::setPeerCodecCapabilities(const uint8_t* /* p_peer_codec_capabilities */) {

  // setPeerCodecCapabilities updates the selectable

  // capabilities in the codec config. It can be safely

  // ignored as providing a superset of the selectable