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

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

Merge "Check if device is null before checking its type is echo reference."... 

Merge "Check if device is null before checking its type is echo reference." into main am: 17500790 am: db897706

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



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

services/audiopolicy/enginedefault/src/Engine.cpp

+1 −1
Original line number Diff line number Diff line
@@ -901,7 +901,7 @@ sp<DeviceDescriptor> Engine::getInputDeviceForAttributes(const audio_attributes_ 


    device = getDeviceForInputSource(attr.source);



    if (device->type() == AUDIO_DEVICE_IN_ECHO_REFERENCE) {

    if (device != nullptr && device->type() == AUDIO_DEVICE_IN_ECHO_REFERENCE) {

        sp<DeviceDescriptor> device2 = getInputDeviceForEchoRef(attr, availableInputDevices);

        if (device2 != nullptr) {

            return device2;