diff options
| author | Shunkai Yao <yaoshunkai@google.com> | 2023-12-13 00:49:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-13 00:49:37 +0000 |
| commit | 95c581c760313f8c2bfaeed5c5c3e7ee6ad6bf86 (patch) | |
| tree | 0d528012542c8bddb1551bd7a8ee564b54348b4d | |
| parent | 7ca6c8e820cefdde019d3c5c3feef7099f193f4c (diff) | |
| parent | f155ba56c166ccc3f2b02ea23f020f9311db9057 (diff) | |
| download | av-95c581c760313f8c2bfaeed5c5c3e7ee6ad6bf86.tar.gz | |
Merge changes from topic "revert-2862771-cuttlefish_aidl_audio-2-TFSIHPUCWV" into main am: be26d020c2 am: 1ae4c24bb0 am: f155ba56c1
Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2871091
Change-Id: I992452ae8b32e9ca186e59bcc02a3048b7616848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | media/libaudiohal/FactoryHal.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libaudiohal/FactoryHal.cpp b/media/libaudiohal/FactoryHal.cpp index c414e19e9b..f88915d7f4 100644 --- a/media/libaudiohal/FactoryHal.cpp +++ b/media/libaudiohal/FactoryHal.cpp @@ -50,8 +50,9 @@ using InterfaceName = std::pair<std::string, std::string>; * This list need to keep sync with AudioHalVersionInfo.VERSIONS in * media/java/android/media/AudioHalVersionInfo.java. */ -static const std::array<AudioHalVersionInfo, 6> sAudioHALVersions = { - AudioHalVersionInfo(AudioHalVersionInfo::Type::AIDL, 1, 0), +static const std::array<AudioHalVersionInfo, 5> sAudioHALVersions = { + // TODO: remove this comment to get AIDL + // AudioHalVersionInfo(AudioHalVersionInfo::Type::AIDL, 1, 0), AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 7, 1), AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 7, 0), AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 6, 0), |