diff options
| author | 2023-12-04 22:42:26 +0000 | |
|---|---|---|
| committer | 2023-12-04 22:42:26 +0000 | |
| commit | 6e39bef5f49986608343f89a0f3935406ab8df46 (patch) | |
| tree | f23b07be2916649e1f1871baabef40e5ab7b7683 | |
| parent | 5b58e85b90dbab8c605c5682c21a4f39884f2c63 (diff) | |
| parent | 3e967bf350d7e0a8eadf16f0a2bdbdfc33d6a294 (diff) | |
Merge "Enable AIDL HAL support in the framework" into main
| -rw-r--r-- | media/java/android/media/AudioHalVersionInfo.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/media/java/android/media/AudioHalVersionInfo.java b/media/java/android/media/AudioHalVersionInfo.java index 985a7584ffe2..693aeb4db36c 100644 --- a/media/java/android/media/AudioHalVersionInfo.java +++ b/media/java/android/media/AudioHalVersionInfo.java @@ -77,9 +77,8 @@ 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(HIDL_7_1, HIDL_7_0, HIDL_6_0, HIDL_5_0, HIDL_4_0); + List.of(AIDL_1_0, 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(); |