15 files changed, 20 insertions, 22 deletions
diff --git a/system/audio_hal_interface/Android.bp b/system/audio_hal_interface/Android.bp
index 49175192d3..961be40e0c 100644
--- a/system/audio_hal_interface/Android.bp
+++ b/system/audio_hal_interface/Android.bp
@@ -37,12 +37,12 @@ cc_library_static {
                 "android.hardware.bluetooth.audio-V1-ndk",
             ],
             srcs: [
-                "aidl/a2dp_encoding.cc",
+                "aidl/a2dp_encoding_aidl.cc",
                 "aidl/bluetooth_audio_port_impl.cc",
-                "aidl/client_interface.cc",
-                "aidl/codec_status.cc",
-                "aidl/hearing_aid_software_encoding.cc",
-                "aidl/le_audio_software.cc",
+                "aidl/client_interface_aidl.cc",
+                "aidl/codec_status_aidl.cc",
+                "aidl/hearing_aid_software_encoding_aidl.cc",
+                "aidl/le_audio_software_aidl.cc",
                 "hidl/a2dp_encoding_hidl.cc",
                 "hidl/client_interface_hidl.cc",
                 "hidl/codec_status_hidl.cc",
diff --git a/system/audio_hal_interface/a2dp_encoding.cc b/system/audio_hal_interface/a2dp_encoding.cc
index d0028e1ef9..c8a5316585 100644
--- a/system/audio_hal_interface/a2dp_encoding.cc
+++ b/system/audio_hal_interface/a2dp_encoding.cc
@@ -16,7 +16,7 @@
 
 #include "a2dp_encoding.h"
 
-#include "aidl/a2dp_encoding.h"
+#include "aidl/a2dp_encoding_aidl.h"
 #include "hal_version_manager.h"
 #include "hidl/a2dp_encoding_hidl.h"
 
diff --git a/system/audio_hal_interface/aidl/a2dp_encoding.cc b/system/audio_hal_interface/aidl/a2dp_encoding_aidl.cc
index da1cb432d6..4622186ce9 100644
--- a/system/audio_hal_interface/aidl/a2dp_encoding.cc
+++ b/system/audio_hal_interface/aidl/a2dp_encoding_aidl.cc
@@ -15,11 +15,11 @@
  */
 #define LOG_TAG "a2dp_encoding"
 
-#include "a2dp_encoding.h"
+#include "a2dp_encoding_aidl.h"
 
 #include "a2dp_transport.h"
 #include "audio_aidl_interfaces.h"
-#include "codec_status.h"
+#include "codec_status_aidl.h"
 #include "transport_instance.h"
 
 namespace bluetooth {
diff --git a/system/audio_hal_interface/aidl/a2dp_encoding.h b/system/audio_hal_interface/aidl/a2dp_encoding_aidl.h
index a49c767589..a49c767589 100644
--- a/system/audio_hal_interface/aidl/a2dp_encoding.h
+++ b/system/audio_hal_interface/aidl/a2dp_encoding_aidl.h
diff --git a/system/audio_hal_interface/aidl/a2dp_transport.h b/system/audio_hal_interface/aidl/a2dp_transport.h
index a36c5390e3..835a6a58fe 100644
--- a/system/audio_hal_interface/aidl/a2dp_transport.h
+++ b/system/audio_hal_interface/aidl/a2dp_transport.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "client_interface.h"
+#include "client_interface_aidl.h"
 
 namespace bluetooth {
 namespace audio {
diff --git a/system/audio_hal_interface/aidl/client_interface.cc b/system/audio_hal_interface/aidl/client_interface_aidl.cc
index 6bf3bd7db2..2c1de92dd5 100644
--- a/system/audio_hal_interface/aidl/client_interface.cc
+++ b/system/audio_hal_interface/aidl/client_interface_aidl.cc
@@ -16,7 +16,7 @@
 
 #define LOG_TAG "BTAudioClientIf"
 
-#include "client_interface.h"
+#include "client_interface_aidl.h"
 
 #include <android/binder_manager.h>
 
@@ -235,8 +235,7 @@ bool BluetoothAudioClientInterface::UpdateAudioConfig(
 bool BluetoothAudioClientInterface::SetLowLatencyModeAllowed(bool allowed) {
   is_low_latency_allowed_ = allowed;
   if (provider_ == nullptr) {
-    LOG(INFO) << __func__
-              << ": BluetoothAudioHal nullptr";
+    LOG(INFO) << __func__ << ": BluetoothAudioHal nullptr";
     return false;
   }
 
@@ -249,7 +248,6 @@ bool BluetoothAudioClientInterface::SetLowLatencyModeAllowed(bool allowed) {
   return true;
 }
 
-
 int BluetoothAudioClientInterface::StartSession() {
   std::lock_guard<std::mutex> guard(internal_mutex_);
   if (provider_ == nullptr) {
diff --git a/system/audio_hal_interface/aidl/client_interface.h b/system/audio_hal_interface/aidl/client_interface_aidl.h
index e423585313..e423585313 100644
--- a/system/audio_hal_interface/aidl/client_interface.h
+++ b/system/audio_hal_interface/aidl/client_interface_aidl.h
diff --git a/system/audio_hal_interface/aidl/codec_status.cc b/system/audio_hal_interface/aidl/codec_status_aidl.cc
index 996a67eb36..6e63fb3929 100644
--- a/system/audio_hal_interface/aidl/codec_status.cc
+++ b/system/audio_hal_interface/aidl/codec_status_aidl.cc
@@ -16,7 +16,7 @@
 
 #define LOG_TAG "bluetooth"
 
-#include "codec_status.h"
+#include "codec_status_aidl.h"
 
 #include <unordered_set>
 
@@ -26,7 +26,7 @@
 #include "a2dp_vendor_aptx_hd_constants.h"
 #include "a2dp_vendor_ldac_constants.h"
 #include "bta/av/bta_av_int.h"
-#include "client_interface.h"
+#include "client_interface_aidl.h"
 
 namespace bluetooth {
 namespace audio {
diff --git a/system/audio_hal_interface/aidl/codec_status.h b/system/audio_hal_interface/aidl/codec_status_aidl.h
index c2fa8191b1..c2fa8191b1 100644
--- a/system/audio_hal_interface/aidl/codec_status.h
+++ b/system/audio_hal_interface/aidl/codec_status_aidl.h
diff --git a/system/audio_hal_interface/aidl/hearing_aid_software_encoding.cc b/system/audio_hal_interface/aidl/hearing_aid_software_encoding_aidl.cc
index 013d60c5c8..94602531ad 100644
--- a/system/audio_hal_interface/aidl/hearing_aid_software_encoding.cc
+++ b/system/audio_hal_interface/aidl/hearing_aid_software_encoding_aidl.cc
@@ -16,10 +16,10 @@
 
 #define LOG_TAG "BTAudioClientHearingAid"
 
-#include "hearing_aid_software_encoding.h"
+#include "hearing_aid_software_encoding_aidl.h"
 
 #include "audio_hearing_aid_hw/include/audio_hearing_aid_hw.h"
-#include "client_interface.h"
+#include "client_interface_aidl.h"
 #include "osi/include/log.h"
 #include "osi/include/properties.h"
 
diff --git a/system/audio_hal_interface/aidl/hearing_aid_software_encoding.h b/system/audio_hal_interface/aidl/hearing_aid_software_encoding_aidl.h
index 977bd7ca14..977bd7ca14 100644
--- a/system/audio_hal_interface/aidl/hearing_aid_software_encoding.h
+++ b/system/audio_hal_interface/aidl/hearing_aid_software_encoding_aidl.h
diff --git a/system/audio_hal_interface/aidl/le_audio_software.cc b/system/audio_hal_interface/aidl/le_audio_software_aidl.cc
index b101c2df1b..4394216bfc 100644
--- a/system/audio_hal_interface/aidl/le_audio_software.cc
+++ b/system/audio_hal_interface/aidl/le_audio_software_aidl.cc
@@ -17,12 +17,12 @@
 
 #define LOG_TAG "BTAudioClientLeAudioAIDL"
 
-#include "le_audio_software.h"
+#include "le_audio_software_aidl.h"
 
 #include <unordered_map>
 #include <vector>
 
-#include "codec_status.h"
+#include "codec_status_aidl.h"
 #include "hal_version_manager.h"
 
 namespace bluetooth {
diff --git a/system/audio_hal_interface/aidl/le_audio_software.h b/system/audio_hal_interface/aidl/le_audio_software_aidl.h
index a38834abd4..7d2ee8036d 100644
--- a/system/audio_hal_interface/aidl/le_audio_software.h
+++ b/system/audio_hal_interface/aidl/le_audio_software_aidl.h
@@ -19,7 +19,7 @@
 #include "../le_audio_software.h"
 #include "audio_aidl_interfaces.h"
 #include "bta/le_audio/le_audio_types.h"
-#include "client_interface.h"
+#include "client_interface_aidl.h"
 
 namespace bluetooth {
 namespace audio {
diff --git a/system/audio_hal_interface/hearing_aid_software_encoding.cc b/system/audio_hal_interface/hearing_aid_software_encoding.cc
index e3ffd1d613..ed1be1d5e3 100644
--- a/system/audio_hal_interface/hearing_aid_software_encoding.cc
+++ b/system/audio_hal_interface/hearing_aid_software_encoding.cc
@@ -16,7 +16,7 @@
 
 #include "hearing_aid_software_encoding.h"
 
-#include "aidl/hearing_aid_software_encoding.h"
+#include "aidl/hearing_aid_software_encoding_aidl.h"
 #include "hal_version_manager.h"
 #include "hidl/hearing_aid_software_encoding_hidl.h"
 
diff --git a/system/audio_hal_interface/le_audio_software.cc b/system/audio_hal_interface/le_audio_software.cc
index 3d00a539af..efb9d43bb1 100644
--- a/system/audio_hal_interface/le_audio_software.cc
+++ b/system/audio_hal_interface/le_audio_software.cc
@@ -22,7 +22,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "aidl/le_audio_software.h"
+#include "aidl/le_audio_software_aidl.h"
 #include "bta/le_audio/codec_manager.h"
 #include "hal_version_manager.h"
 #include "hidl/le_audio_software_hidl.h"