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

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

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

parents a0cbfd71 e1772dd4

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),