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

Commit 6970cb55 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove flag leaudio_dynamic_spatial_audio" into main am: 9941cb3e 

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



Change-Id: Ibd3620b8509a70e6735f199328a0a0acc011af35
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 09452797 9941cb3e

flags/leaudio.aconfig

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

}



flag {

    name: "leaudio_dynamic_spatial_audio"

    namespace: "bluetooth"

    description: "Support Dynamic Spatial Audio for LE Audio"

    bug: "309665975"

}



flag {

    name: "metadata_api_inactive_audio_device_upon_connection"

    is_exported: true

system/audio_hal_interface/aidl/le_audio_software_aidl.cc

+14 −18
Original line number Diff line number Diff line
@@ -158,14 +158,12 @@ void LeAudioTransport::SetLatencyMode(LatencyMode latency_mode) { 
      return;

  }



  if (com::android::bluetooth::flags::leaudio_dynamic_spatial_audio()) {

  if (dsa_mode_ != prev_dsa_mode && cached_source_metadata_.tracks != nullptr &&

      cached_source_metadata_.tracks != 0) {

    log::info(", latency mode changed, update source metadata");

    stream_cb_.on_metadata_update_(cached_source_metadata_, dsa_mode_);

  }

}

}



bool LeAudioTransport::GetPresentationPosition(uint64_t* remote_delay_report_ns,

                                               uint64_t* total_bytes_processed,
@@ -193,7 +191,6 @@ void LeAudioTransport::SourceMetadataChanged(const source_metadata_v7_t& source_ 
    return;

  }



  if (com::android::bluetooth::flags::leaudio_dynamic_spatial_audio()) {

  if (cached_source_metadata_.tracks != nullptr) {

    free(cached_source_metadata_.tracks);

    cached_source_metadata_.tracks = nullptr;
@@ -207,7 +204,6 @@ void LeAudioTransport::SourceMetadataChanged(const source_metadata_v7_t& source_ 


  cached_source_metadata_.track_count = track_count;

  cached_source_metadata_.tracks = tracks;

  }



  stream_cb_.on_metadata_update_(source_metadata, dsa_mode_);

}

system/audio_hal_interface/le_audio_software.cc

+0 −4
Original line number Diff line number Diff line
@@ -799,10 +799,6 @@ bool LeAudioClientInterface::ReleaseSource(LeAudioClientInterface::Source* sourc 
}



void LeAudioClientInterface::SetAllowedDsaModes(DsaModes dsa_modes) {

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

    return;

  }



  if (HalVersionManager::GetHalTransport() == BluetoothAudioHalTransport::AIDL) {

    if (aidl::le_audio::LeAudioSinkTransport::interface_unicast_ == nullptr ||

        aidl::le_audio::LeAudioSinkTransport::instance_unicast_ == nullptr) {

system/bta/hh/bta_hh_le.cc

+1 −7
Original line number Diff line number Diff line
@@ -232,10 +232,8 @@ void bta_hh_le_enable(void) { 
                        }),

                        false);



  if (com::android::bluetooth::flags::leaudio_dynamic_spatial_audio()) {

  LeAudioClient::RegisterIsoDataConsumer(bta_hh_le_iso_data_callback);

}

}



/*******************************************************************************

 *
@@ -2423,10 +2421,6 @@ static void bta_hh_process_cache_rpt(tBTA_HH_DEV_CB* p_cb, tBTA_HH_RPT_CACHE_ENT 


static bool bta_hh_le_iso_data_callback(const RawAddress& addr, uint16_t /*cis_conn_hdl*/,

                                        uint8_t* data, uint16_t size, uint32_t /*timestamp*/) {

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

    log::warn("DSA not supported");

    return false;

  }



  tAclLinkSpec link_spec = {.addrt.bda = addr, .transport = BT_TRANSPORT_LE};

system/bta/le_audio/client.cc

+1 −15
Original line number Diff line number Diff line
@@ -1466,9 +1466,7 @@ public: 
    log::assert_that(le_audio_sink_hal_client_ != nullptr, "Sink session not acquired");



    DsaModes dsa_modes = {DsaMode::DISABLED};

    if (com::android::bluetooth::flags::leaudio_dynamic_spatial_audio()) {

    dsa_modes = group->GetAllowedDsaModes();

    }



    /* We assume that peer device always use same frame duration */

    uint32_t frame_duration_us = 0;
@@ -5463,10 +5461,6 @@ public: 
  }



  bool DsaReconfigureNeeded(LeAudioDeviceGroup* group, LeAudioContextType context) {

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

      return false;

    }



    // Reconfigure if DSA mode changed for media streaming

    if (context != bluetooth::le_audio::types::LeAudioContextType::MEDIA) {

      return false;
@@ -6259,10 +6253,6 @@ private: 
  }



  bool DsaDataConsume(bluetooth::hci::iso_manager::cis_data_evt* event) {

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

      return false;

    }



    if (active_group_id_ == bluetooth::groups::kGroupUnknown) {

      return false;

    }
@@ -6720,10 +6710,6 @@ void LeAudioClient::Cleanup(void) { 
}



bool LeAudioClient::RegisterIsoDataConsumer(LeAudioIsoDataCallback callback) {

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

    return false;

  }



  log::info("ISO data consumer changed");

  iso_data_callback = callback;

  return true;