commit 7d23f3e3e0c8e58176cd6046a13fd54bb726236d
author Mikhail Naganov <mnaganov@google.com> Tue Dec 05 00:51:10 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 05 00:51:10 2023 +0000
tree 83c89dc548d9d88062691954c74d292bcb624a34
parent bcf650ef6b177c57a90c4c034bf705652d2bd767
parent a2262c1f7bb02a7c186297b69af25df399085802

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2858286

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

media/java/android/media/AudioHalVersionInfo.java

diff --git a/media/java/android/media/AudioHalVersionInfo.java b/media/java/android/media/AudioHalVersionInfo.java
index 693aeb4..985a758 100644
--- a/media/java/android/media/AudioHalVersionInfo.java
+++ b/media/java/android/media/AudioHalVersionInfo.java
@@ -77,8 +77,9 @@
      * List of all valid Audio HAL versions. This list need to be in sync with sAudioHALVersions
      * defined in frameworks/av/media/libaudiohal/FactoryHalHidl.cpp.
      */
+    // TODO: add AIDL_1_0 with sAudioHALVersions.
     public static final @NonNull List<AudioHalVersionInfo> VERSIONS =
-            List.of(AIDL_1_0, HIDL_7_1, HIDL_7_0, HIDL_6_0, HIDL_5_0, HIDL_4_0);
+            List.of(HIDL_7_1, HIDL_7_0, HIDL_6_0, HIDL_5_0, HIDL_4_0);
 
     private static final String TAG = "AudioHalVersionInfo";
     private AudioHalVersion mHalVersion = new AudioHalVersion();