commit c94f3aa8ea90c1d43fd801b45221c8471701176c
author Mikhail Naganov <mnaganov@google.com> Tue Dec 05 00:40:48 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 05 00:40:48 2023 +0000
tree d9419976aa56a25b6af80c7ebbac4f6cde5b144a
parent a0cbfd71452376400d035c9bfc5eeedf85a1d25b
parent e1772dd48444e41445bd0556e0b89f02eb95d46e

Merge "Revert "Enable AIDL HAL support in the framework"" into main

media/libaudiohal/FactoryHal.cpp

diff --git a/media/libaudiohal/FactoryHal.cpp b/media/libaudiohal/FactoryHal.cpp
index c414e19..f88915d 100644
--- a/media/libaudiohal/FactoryHal.cpp
+++ b/media/libaudiohal/FactoryHal.cpp
@@ -50,8 +50,9 @@
  * This list need to keep sync with AudioHalVersionInfo.VERSIONS in
  * media/java/android/media/AudioHalVersionInfo.java.
  */
-static const std::array<AudioHalVersionInfo, 6> sAudioHALVersions = {
-    AudioHalVersionInfo(AudioHalVersionInfo::Type::AIDL, 1, 0),
+static const std::array<AudioHalVersionInfo, 5> sAudioHALVersions = {
+    // TODO: remove this comment to get AIDL
+    // AudioHalVersionInfo(AudioHalVersionInfo::Type::AIDL, 1, 0),
     AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 7, 1),
     AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 7, 0),
     AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 6, 0),