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

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

Merge "Fix comment typo in HwModule" into main am: b1dff394 

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



Change-Id: I67ba9f0f98fc739d7ca70a6c8c22c742d3a6b772
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 399c153d b1dff394

services/audiopolicy/common/managerdefinitions/src/HwModule.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -361,7 +361,7 @@ sp<DeviceDescriptor> HwModuleCollection::getDeviceDescriptor(const audio_devices 
        DeviceVector moduleDevices = hwModule->getAllDevices();

        DeviceVector moduleDevices = hwModule->getAllDevices();

        auto moduleDevice = moduleDevices.getDevice(deviceType, devAddress, encodedFormat);

        auto moduleDevice = moduleDevices.getDevice(deviceType, devAddress, encodedFormat);





        // Prevent overwritting moduleDevice address if connected device does not have the same

        // Prevent overwriting moduleDevice address if connected device does not have the same

        // address (since getDevice with empty address ignores match on address), use dynamic device

        // address (since getDevice with empty address ignores match on address), use dynamic device

        if (moduleDevice && allowToCreate &&

        if (moduleDevice && allowToCreate &&

                (!moduleDevice->address().empty() &&

                (!moduleDevice->address().empty() &&