Revert "Adding provision to remote delay at AIDL client side"

This reverts commit a8747585175c618674ae8d7b663ceea2f928b2cb.

Change-Id: I8df9ebae5672b41f1c6d1d2cfe90eb5a94d3192c

7 files changed, 9 insertions, 97 deletions

diff --git a/audio_hal_interface/aidl/le_audio_software.cc b/audio_hal_interface/aidl/le_audio_software.cc
index 32ed8d242..ecfb2119f 100644
--- a/audio_hal_interface/aidl/le_audio_software.cc
+++ b/audio_hal_interface/aidl/le_audio_software.cc
@@ -150,11 +150,11 @@ bool LeAudioTransport::GetPresentationPosition(uint64_t* remote_delay_report_ns,
             << data_position_.tv_nsec
             << "s, delay report=" << remote_delay_report_ms_ << " msec.";
   if (remote_delay_report_ns != nullptr) {
-    *remote_delay_report_ns = (uint64_t)(remote_delay_report_ms_ * 1000000u);
+    *remote_delay_report_ns = remote_delay_report_ms_ * 1000000u;
   }
   if (total_bytes_processed != nullptr)
-    *total_bytes_processed = (uint64_t)total_bytes_processed_;
-  if (data_position != nullptr) *data_position = (timespec)data_position_;
+    *total_bytes_processed = total_bytes_processed_;
+  if (data_position != nullptr) *data_position = data_position_;
 
   return true;
 }
@@ -235,11 +235,6 @@ void LeAudioTransport::SetRemoteDelay(uint16_t delay_report_ms) {
   remote_delay_report_ms_ = delay_report_ms;
 }
 
-uint16_t LeAudioTransport::GetRemoteDelay() {
-  LOG(INFO) << __func__ << ": delay_report=" << remote_delay_report_ms_ << " msec";
-  return remote_delay_report_ms_;
-}
-
 const PcmConfiguration& LeAudioTransport::LeAudioGetSelectedHalPcmConfig() {
   return pcm_config_;
 }
@@ -347,10 +342,6 @@ void LeAudioSinkTransport::SetRemoteDelay(uint16_t delay_report_ms) {
   transport_->SetRemoteDelay(delay_report_ms);
 }
 
-uint16_t LeAudioSinkTransport::GetRemoteDelay() {
-  return transport_->GetRemoteDelay();
-}
-
 const PcmConfiguration& LeAudioSinkTransport::LeAudioGetSelectedHalPcmConfig() {
   return transport_->LeAudioGetSelectedHalPcmConfig();
 }
@@ -444,10 +435,6 @@ void LeAudioSourceTransport::SetRemoteDelay(uint16_t delay_report_ms) {
   transport_->SetRemoteDelay(delay_report_ms);
 }
 
-uint16_t LeAudioSourceTransport::GetRemoteDelay() {
-  return transport_->GetRemoteDelay();
-}
-
 const PcmConfiguration&
 LeAudioSourceTransport::LeAudioGetSelectedHalPcmConfig() {
   return transport_->LeAudioGetSelectedHalPcmConfig();
@@ -556,10 +543,6 @@ void LeAudioClientInterface::Sink::SetRemoteDelay(uint16_t delay_report_ms) {
       delay_report_ms);
 }
 
-uint16_t LeAudioClientInterface::Sink::GetRemoteDelay() {
-  return get_aidl_transport_instance(is_broadcaster_)->GetRemoteDelay();
-}
-
 void LeAudioClientInterface::Sink::StartSession() {
   LOG(ERROR) << __func__;
   AudioConfigurationAIDL audio_config;
@@ -698,10 +681,6 @@ void LeAudioClientInterface::Source::SetRemoteDelay(uint16_t delay_report_ms) {
       delay_report_ms);
 }
 
-uint16_t LeAudioClientInterface::Source::GetRemoteDelay() {
-  return aidl::le_audio::LeAudioSourceTransport::instance->GetRemoteDelay();
-}
-
 void LeAudioClientInterface::Source::StartSession() {
   LOG(INFO) << __func__;
   AudioConfigurationAIDL audio_config;
diff --git a/audio_hal_interface/aidl/le_audio_software.h b/audio_hal_interface/aidl/le_audio_software.h
index faa3a61fb..ab2beb692 100644
--- a/audio_hal_interface/aidl/le_audio_software.h
+++ b/audio_hal_interface/aidl/le_audio_software.h
@@ -127,8 +127,6 @@ class LeAudioTransport {
 
   void SetRemoteDelay(uint16_t delay_report_ms);
 
-  uint16_t GetRemoteDelay();
-
   const PcmConfiguration& LeAudioGetSelectedHalPcmConfig();
 
   void LeAudioSetSelectedHalPcmConfig(uint32_t sample_rate_hz, uint8_t bit_rate,
@@ -183,8 +181,6 @@ class LeAudioSinkTransport
 
   void SetRemoteDelay(uint16_t delay_report_ms);
 
-  uint16_t GetRemoteDelay();
-
   const PcmConfiguration& LeAudioGetSelectedHalPcmConfig();
 
   void LeAudioSetSelectedHalPcmConfig(uint32_t sample_rate_hz, uint8_t bit_rate,
@@ -234,8 +230,6 @@ class LeAudioSourceTransport
 
   void SetRemoteDelay(uint16_t delay_report_ms);
 
-  uint16_t GetRemoteDelay();
-
   const PcmConfiguration& LeAudioGetSelectedHalPcmConfig();
 
   void LeAudioSetSelectedHalPcmConfig(uint32_t sample_rate_hz, uint8_t bit_rate,
@@ -268,7 +262,6 @@ class LeAudioClientInterface {
     virtual void Cleanup() = 0;
     virtual void SetPcmParameters(const PcmParameters& params) = 0;
     virtual void SetRemoteDelay(uint16_t delay_report_ms) = 0;
-    virtual uint16_t GetRemoteDelay() = 0;
     virtual void StartSession() = 0;
     virtual void StopSession() = 0;
     virtual tA2DP_CTRL_CMD GetPendingCmd() = 0;
@@ -291,7 +284,6 @@ class LeAudioClientInterface {
     void Cleanup() override;
     void SetPcmParameters(const PcmParameters& params) override;
     void SetRemoteDelay(uint16_t delay_report_ms) override;
-    uint16_t GetRemoteDelay() override;
     void StartSession() override;
     void StopSession() override;
     tA2DP_CTRL_CMD GetPendingCmd() override;
@@ -319,7 +311,6 @@ class LeAudioClientInterface {
     void Cleanup() override;
     void SetPcmParameters(const PcmParameters& params) override;
     void SetRemoteDelay(uint16_t delay_report_ms) override;
-    uint16_t GetRemoteDelay() override;
     void StartSession() override;
     void StopSession() override;
     tA2DP_CTRL_CMD GetPendingCmd() override;
diff --git a/btif/include/btif_ahim.h b/btif/include/btif_ahim.h
index 6fee2b349..239893e46 100644
--- a/btif/include/btif_ahim.h
+++ b/btif/include/btif_ahim.h
@@ -144,7 +144,6 @@ typedef void (* ahim_update_src_metadata)(const source_metadata_t& source_metada
 typedef void (* ahim_update_snk_metadata)(const sink_metadata_t& sink_metadata);
 typedef uint32_t (* ahim_get_mode_callback)();
 typedef uint16_t (* ahim_get_frame_duration)(uint8_t direction);
-typedef void (* ahim_update_params)(uint16_t delay, uint8_t mode);
 
 typedef struct {
     uint8_t mode;
@@ -169,7 +168,6 @@ typedef struct {
     ahim_update_snk_metadata snk_meta_update;
     ahim_get_mode_callback get_mode_cb;
     ahim_get_frame_duration get_frame_duration;
-    ahim_update_params params_update;
 }btif_ahim_client_callbacks_t;
 
 extern btif_ahim_client_callbacks_t* pclient_cbs[MAX_CLIENT];
@@ -200,10 +198,6 @@ bool btif_ahim_is_restart_session_needed(uint8_t profile);
 
 void btif_ahim_update_session_params(SessionParamType param_type);
 
-void btif_ahim_update_audio_config();
-
-uint16_t btif_ahim_get_remote_delay();
-
 bool btif_ahim_setup_codec(uint8_t profile);
 
 void btif_ahim_start_session(uint8_t profile);
@@ -217,8 +211,6 @@ tA2DP_CTRL_CMD btif_ahim_get_pending_command(uint8_t profile,
 
 void btif_ahim_reset_pending_command(uint8_t profile);
 
-void btif_ahim_update_params (uint16_t delay, uint8_t mode);
-
 void btif_ahim_reset_pending_command(uint8_t profile, uint8_t direction);
 
 void btif_ahim_update_pending_command(tA2DP_CTRL_CMD cmd, uint8_t profile);
diff --git a/btif/include/btif_api.h b/btif/include/btif_api.h
index 1e733720a..f549519bf 100644
--- a/btif/include/btif_api.h
+++ b/btif/include/btif_api.h
@@ -527,7 +527,6 @@ bt_status_t btif_set_dynamic_audio_buffer_size(int codec, int size);
  * Returns          void
  *
  ******************************************************************************/
-void btif_update_params(uint16_t delay, uint8_t mode);
 #ifdef ADV_AUDIO_FEATURE
 void btif_register_uuid_srvc_disc(bluetooth::Uuid uuid);
 #endif
diff --git a/btif/src/btif_ahim.cc b/btif/src/btif_ahim.cc
index 96fc27dc8..c9d0de4b2 100644
--- a/btif/src/btif_ahim.cc
+++ b/btif/src/btif_ahim.cc
@@ -252,17 +252,6 @@ void btif_ahim_update_src_metadata (const source_metadata_t& source_metadata) {
   }
 }
 
-void btif_ahim_update_params (uint16_t delay, uint8_t mode) {
-  // pass on the callbacks to ACM only for new vendor
-  if(btif_ahim_is_aosp_aidl_hal_enabled()) {
-    if (pclient_cbs[AUDIO_GROUP_MGR - 1] &&
-        pclient_cbs[AUDIO_GROUP_MGR - 1]->params_update) {
-      BTIF_TRACE_IMP("%s: calling updateParams for Audio Group Manager", __func__);
-      pclient_cbs[AUDIO_GROUP_MGR - 1]->params_update(delay, mode);
-    }
-  }
-}
-
 void btif_ahim_update_sink_metadata (const sink_metadata_t& sink_metadata) {
   auto track_count = sink_metadata.track_count;
   auto source = sink_metadata.tracks->source;
@@ -571,12 +560,11 @@ LeAudioConfiguration fetch_offload_audio_config(int profile, int direction) {
         le_vendor_config.vendorCodecType = VendorCodecType::APTX_ADAPTIVE_R4;
         LOG(ERROR) << __func__ << ": AptX R4 metadata params are updated";
         for (int i = 0; i < 4; i++) {
-          le_vendor_config.codecSpecificData.push_back((pclient_cbs[profile - 1]->get_mode_cb() &
-          (0xff <<((3 - i)*8))) >> ((3 - i)*8));
-        }
-        for (int i = 4; i < 6; i++) {
-          le_vendor_config.codecSpecificData.push_back((unicastSinkClientInterface->GetRemoteDelay() &
-          (0xff <<((5 - i)*8))) >> ((5 - i)*8));
+          le_vendor_config.codecSpecificData.push_back((
+             pclient_cbs[profile - 1]->get_mode_cb() &
+             (0xff <<((3 - i)*8))) >> ((3 - i)*8));
+           BTIF_TRACE_IMP("%s: AIDL, extension metadata for AAR4 [%d]: %d", __func__, i+16,
+                      le_vendor_config.codecSpecificData[i+16]);
         }
       } else {
         le_vendor_config.vendorCodecType = VendorCodecType::APTX_ADAPTIVE_R3;
@@ -1195,28 +1183,6 @@ size_t btif_ahim_read(uint8_t* p_buf, uint32_t len) {
   return bluetooth::audio::aidl::a2dp::read(p_buf, len);
 }
 
-void btif_ahim_update_audio_config() {
-  AudioConfigurationAIDL lea_tx_config, lea_rx_config;
-  CodecIndex codec_type =
-    (CodecIndex) pclient_cbs[AUDIO_GROUP_MGR - 1]->get_codec_type(TX_ONLY_CONFIG);
-  if (codec_type == CodecIndex::CODEC_INDEX_SOURCE_APTX_ADAPTIVE_R4) {
-    if (!leAudio_get_selected_hal_codec_config(&lea_tx_config, AUDIO_GROUP_MGR,
-                                                TX_ONLY_CONFIG)) {
-      LOG(ERROR) << __func__ << ": Failed to get CodecConfiguration";
-      return;
-    }
-    if(unicastSinkClientInterface)
-      unicastSinkClientInterface->UpdateAudioConfigToHal(lea_tx_config);
-  }
-}
-
-uint16_t btif_ahim_get_remote_delay() {
-if(unicastSinkClientInterface)
-  return unicastSinkClientInterface->GetRemoteDelay();
-else
-  return 0xFFFF;
-}
-
 void btif_ahim_set_remote_delay(uint16_t delay_report, uint8_t profile) {
   BTIF_TRACE_IMP("%s: AIDL, profile: %d, delay_report: %d",
                                         __func__, profile, delay_report);
@@ -1241,6 +1207,7 @@ void btif_ahim_set_remote_delay(uint16_t delay_report, uint8_t profile) {
         if(unicastSourceClientInterface)
           unicastSourceClientInterface->SetRemoteDelay(delay_report);
       }
+
     } else if (profile == BROADCAST) {
       if (broadcastSinkClientInterface) {
         broadcastSinkClientInterface->SetRemoteDelay(delay_report);
diff --git a/btif/src/btif_core.cc b/btif/src/btif_core.cc
index 843b1eb66..44d6acb94 100644
--- a/btif/src/btif_core.cc
+++ b/btif/src/btif_core.cc
@@ -67,7 +67,6 @@
 #include "stack_manager.h"
 #include "device/include/device_iot_config.h"
 
-#include "btif_ahim.h"
 using bluetooth::Uuid;
 /*******************************************************************************
  *  Constants & Macros
@@ -1450,8 +1449,3 @@ bt_status_t btif_set_dynamic_audio_buffer_size(int codec, int size) {
 
   return BT_STATUS_SUCCESS;
 }
-
-void btif_update_params(uint16_t delay, uint8_t mode) {
-  BTIF_TRACE_DEBUG("%s", __func__);
-  btif_ahim_update_params(delay, mode);
-}
diff --git a/stack/btm/btm_devctl.cc b/stack/btm/btm_devctl.cc
index 0e0ef828a..e83f00823 100644
--- a/stack/btm/btm_devctl.cc
+++ b/stack/btm/btm_devctl.cc
@@ -44,7 +44,6 @@
 
 #include "gatt_int.h"
 #include "hci/include/vendor.h"
-#include "btif/include/btif_api.h"
 
 extern thread_t* bt_workqueue_thread;
 
@@ -62,7 +61,6 @@ extern thread_t* bt_workqueue_thread;
                 */
 
 #define BTM_INFO_TIMEOUT 5 /* 5 seconds for info response */
-#define HCI_VSE_SUBCODE_PARAMS_REPORT 0x12
 
 /******************************************************************************/
 /*            L O C A L    F U N C T I O N     P R O T O T Y P E S            */
@@ -928,14 +926,6 @@ void btm_vendor_specific_evt(uint8_t* p, uint8_t evt_len) {
           break;
       }
       return;
-    } else if (HCI_VSE_SUBCODE_PARAMS_REPORT == vse_subcode){
-      BTM_TRACE_DEBUG ("BTM Event: Vendor Specific params report evt");
-      uint16_t delay;
-      uint8_t mode;
-      STREAM_TO_UINT16(delay, pp);
-      STREAM_TO_UINT8(mode, pp);
-      BTM_TRACE_DEBUG ("%s: Delay value = %x, Mode value = %x", __func__, delay, mode);
-      btif_update_params(delay, mode);
     }
   }