commit fef58f8c007fdfaec6347ed1986d71b43d6be91a
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:20 2023 +0000
tree 85e05784393118e2cb113aacf112cae7994afdb6
parent 3e967bf350d7e0a8eadf16f0a2bdbdfc33d6a294

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: I9e3ebc87aa5923a78805e997e44693958c74d6e8

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();