2 files changed, 3 insertions, 33 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;