diff options
| author | 2023-12-12 23:27:34 +0000 | |
|---|---|---|
| committer | 2023-12-12 23:27:34 +0000 | |
| commit | 9b7816f981d461430a4fd5418c8ed5c76a404f1d (patch) | |
| tree | e1dd0276975cccd68614b6a772210e444de451fc | |
| parent | 524ddef9bf2597aaf4d0d59557d03ef4b00cd8a3 (diff) | |
| parent | 551352cc35acb233c42ff88284a5bea7646c0e7d (diff) | |
Merge "Enable AIDL HAL support in the framework" into main am: 72e4b15aff am: 18c78ee6d5 am: 551352cc35
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2862771
Change-Id: I4609d2e12ceaf2a4a781f6f9bba21abc31c55706
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 0f48abeb6882..c881a03c6732 100644 --- a/media/java/android/media/AudioHalVersionInfo.java +++ b/media/java/android/media/AudioHalVersionInfo.java @@ -80,9 +80,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(); |