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

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

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

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



Change-Id: I87125b1d173b90c15f4fe65e19a73f34446979bb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b2aac9c3 a0cbfd71

media/libaudiohal/FactoryHal.cpp

+2 −3
Original line number 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

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

 */

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

    // TODO: remove this comment to get AIDL

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

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

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

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

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

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