Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95c581c7 authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge changes from topic "revert-2862771-cuttlefish_aidl_audio-2-TFSIHPUCWV"... 

Merge changes from topic "revert-2862771-cuttlefish_aidl_audio-2-TFSIHPUCWV" into main am: be26d020 am: 1ae4c24b am: f155ba56

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2871091



Change-Id: I992452ae8b32e9ca186e59bcc02a3048b7616848
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ca6c8e8 f155ba56

media/libaudiohal/FactoryHal.cpp

+3 −2
Original line number Diff line number Diff line
@@ -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),