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

Commit 68419858 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Enable AIDL HAL support in the framework"" into main am: c94f3aa8 am: 4f069fb5 am: ca70f98f

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



Change-Id: Ibc842ef1ca8de61173606b5be4a950cc915cd3ea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f10ae9f ca70f98f

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