commit e1772dd48444e41445bd0556e0b89f02eb95d46e
author Mikhail Naganov <mnaganov@google.com> Tue Dec 05 00:24:20 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 05 00:24:30 2023 +0000
tree 1322864d61fef7540f7eed778935c050db133e0f
parent babf9e6f0de87f26f16c5f809a5dc1970f90bfda

Revert "Enable AIDL HAL support in the framework"

Revert submission 2388404-cuttlefish_aidl_audio

Reason for revert: Breaks CtsVirtualDevicesTestCases.*VirtualAudioTest.*

Can be difference in timing, due to larger HAL buffers. Need to investigate.

Reverted changes: /q/submissionid:2388404-cuttlefish_aidl_audio

Bug: 314844829
Change-Id: Ibfba45c6f2707b240414a70f1fea435afe82d2bf

media/libaudiohal/FactoryHal.cpp

diff --git a/media/libaudiohal/FactoryHal.cpp b/media/libaudiohal/FactoryHal.cpp
index c3fa225..84ac64c 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),