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

Commit a0cbfd71 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Gerrit Code Review
Browse files

Merge "Enable AIDL HAL support in the framework" into main

parents 17623351 babf9e6f

media/libaudiohal/FactoryHal.cpp

+2 −3
Original line number Original line Diff line number Diff line
@@ -50,9 +50,8 @@ using InterfaceName = std::pair<std::string, std::string>; 
 * This list need to keep sync with AudioHalVersionInfo.VERSIONS in

 * This list need to keep sync with AudioHalVersionInfo.VERSIONS in

 * media/java/android/media/AudioHalVersionInfo.java.

 * media/java/android/media/AudioHalVersionInfo.java.

 */

 */

static const std::array<AudioHalVersionInfo, 5> sAudioHALVersions = {

static const std::array<AudioHalVersionInfo, 6> sAudioHALVersions = {

    // TODO: remove this comment to get AIDL

    AudioHalVersionInfo(AudioHalVersionInfo::Type::AIDL, 1, 0),

    // AudioHalVersionInfo(AudioHalVersionInfo::Type::AIDL, 1, 0),

    AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 7, 1),

    AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 7, 1),

    AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 7, 0),

    AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 7, 0),

    AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 6, 0),

    AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 6, 0),