summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mikhail Naganov <mnaganov@google.com> 2023-12-05 00:40:47 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-12-05 00:40:47 +0000
commita2262c1f7bb02a7c186297b69af25df399085802 (patch)
tree50b61f8dfaeb2e49ad66d26642b0507e9e7ef670
parent6e39bef5f49986608343f89a0f3935406ab8df46 (diff)
parentfef58f8c007fdfaec6347ed1986d71b43d6be91a (diff)
Merge "Revert "Enable AIDL HAL support in the framework"" into main
-rw-r--r--media/java/android/media/AudioHalVersionInfo.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/java/android/media/AudioHalVersionInfo.java b/media/java/android/media/AudioHalVersionInfo.java
index 693aeb4db36c..985a7584ffe2 100644
--- a/media/java/android/media/AudioHalVersionInfo.java
+++ b/media/java/android/media/AudioHalVersionInfo.java
@@ -77,8 +77,9 @@ public final class AudioHalVersionInfo implements Parcelable, Comparable<AudioHa
* 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();