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

Commit 26e1639d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libaudiohal: Fix initialization of SinkMetadata for HAL V7" am:... 

Merge "libaudiohal: Fix initialization of SinkMetadata for HAL V7" am: 1b8e0f7d am: 412ec213 am: 7516d6d1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52fb2ca5efdd4f81479cc4c858ca936c88ceca64
parents 5aa6e1c0 7516d6d1

media/libaudiohal/impl/DeviceHalHidl.cpp

+4 −0
Original line number Diff line number Diff line
@@ -265,6 +265,10 @@ status_t DeviceHalHidl::openInputStream( 
    (void)outputDevice;

    (void)outputDeviceAddress;

#else

#if MAJOR_VERSION >= 7

    (void)HidlUtils::audioChannelMaskFromHal(

            AUDIO_CHANNEL_NONE, true /*isInput*/, &sinkMetadata.tracks[0].channelMask);

#endif

    if (outputDevice != AUDIO_DEVICE_NONE) {

        DeviceAddress hidlOutputDevice;

        if (status_t status = CoreUtils::deviceAddressFromHal(