diff options
| author | 2023-12-04 23:15:39 +0000 | |
|---|---|---|
| committer | 2023-12-04 23:15:39 +0000 | |
| commit | 2a71132b05627d2b196d56a03af2c598f4cc0b25 (patch) | |
| tree | 2e42a822e67c6ee02303684f7b373066ea1f7852 | |
| parent | 7239f180e63da738bb60784fee0fdc00a77fb95b (diff) | |
| parent | bcf650ef6b177c57a90c4c034bf705652d2bd767 (diff) | |
Merge "Enable AIDL HAL support in the framework" into main am: 6e39bef5f4 am: bcf650ef6b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2390957
Change-Id: I438169b74c7f204311685b85b85208c8783dfc22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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(); |