commit 4f069fb50532c2779bf4d839b6839c63c3d98d5d
author Mikhail Naganov <mnaganov@google.com> Tue Dec 05 01:05:53 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 05 01:05:53 2023 +0000
tree 8a03be5eaa3db9f9225559db07cde8a8015c1532
parent ee6a6ed5b4e2583b10ae7f395970c89ecc299fe6
parent c94f3aa8ea90c1d43fd801b45221c8471701176c

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2858288

Change-Id: Id0b8f14f792c1beb6aad9628cb909aaf11d851c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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),