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

Commit 15c19562 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Log fatal when primary output is not found."

parents df7b3d01 b6b07487

services/audiopolicy/enginedefault/src/Engine.cpp

+7 −2
Original line number Original line Diff line number Diff line
@@ -196,6 +196,7 @@ DeviceVector Engine::getDevicesForStrategyInt(legacy_strategy strategy, 
            audio_devices_t txDevice = getDeviceForInputSource(

            audio_devices_t txDevice = getDeviceForInputSource(

                    AUDIO_SOURCE_VOICE_COMMUNICATION)->type();

                    AUDIO_SOURCE_VOICE_COMMUNICATION)->type();

            sp<AudioOutputDescriptor> primaryOutput = outputs.getPrimaryOutput();

            sp<AudioOutputDescriptor> primaryOutput = outputs.getPrimaryOutput();

            LOG_ALWAYS_FATAL_IF(primaryOutput == nullptr, "Primary output not found");

            DeviceVector availPrimaryInputDevices =

            DeviceVector availPrimaryInputDevices =

                    availableInputDevices.getDevicesFromHwModule(primaryOutput->getModuleHandle());

                    availableInputDevices.getDevicesFromHwModule(primaryOutput->getModuleHandle());
@@ -471,8 +472,8 @@ sp<DeviceDescriptor> Engine::getDeviceForInputSource(audio_source_t inputSource) 
    const SwAudioOutputCollection &outputs = getApmObserver()->getOutputs();

    const SwAudioOutputCollection &outputs = getApmObserver()->getOutputs();

    DeviceVector availableDevices = availableInputDevices;

    DeviceVector availableDevices = availableInputDevices;

    sp<AudioOutputDescriptor> primaryOutput = outputs.getPrimaryOutput();

    sp<AudioOutputDescriptor> primaryOutput = outputs.getPrimaryOutput();

    DeviceVector availablePrimaryDevices = availableInputDevices.getDevicesFromHwModule(

    DeviceVector availablePrimaryDevices = primaryOutput == nullptr ? DeviceVector()

            primaryOutput->getModuleHandle());

            : availableInputDevices.getDevicesFromHwModule(primaryOutput->getModuleHandle());

    sp<DeviceDescriptor> device;

    sp<DeviceDescriptor> device;





    // when a call is active, force device selection to match source VOICE_COMMUNICATION

    // when a call is active, force device selection to match source VOICE_COMMUNICATION
@@ -515,6 +516,7 @@ sp<DeviceDescriptor> Engine::getDeviceForInputSource(audio_source_t inputSource) 
        if ((getPhoneState() == AUDIO_MODE_IN_CALL) &&

        if ((getPhoneState() == AUDIO_MODE_IN_CALL) &&

                (availableOutputDevices.getDevice(AUDIO_DEVICE_OUT_TELEPHONY_TX,

                (availableOutputDevices.getDevice(AUDIO_DEVICE_OUT_TELEPHONY_TX,

                        String8(""), AUDIO_FORMAT_DEFAULT)) == nullptr) {

                        String8(""), AUDIO_FORMAT_DEFAULT)) == nullptr) {

            LOG_ALWAYS_FATAL_IF(availablePrimaryDevices.isEmpty(), "Primary devices not found");

            availableDevices = availablePrimaryDevices;

            availableDevices = availablePrimaryDevices;

        }

        }
@@ -545,6 +547,9 @@ sp<DeviceDescriptor> Engine::getDeviceForInputSource(audio_source_t inputSource) 
    case AUDIO_SOURCE_UNPROCESSED:

    case AUDIO_SOURCE_UNPROCESSED:

    case AUDIO_SOURCE_HOTWORD:

    case AUDIO_SOURCE_HOTWORD:

        if (inputSource == AUDIO_SOURCE_HOTWORD) {

        if (inputSource == AUDIO_SOURCE_HOTWORD) {

            // We should not use primary output criteria for Hotword but rather limit

            // to devices attached to the same HW module as the build in mic

            LOG_ALWAYS_FATAL_IF(availablePrimaryDevices.isEmpty(), "Primary devices not found");

            availableDevices = availablePrimaryDevices;

            availableDevices = availablePrimaryDevices;

        }

        }

        if (getForceUse(AUDIO_POLICY_FORCE_FOR_RECORD) == AUDIO_POLICY_FORCE_BT_SCO) {

        if (getForceUse(AUDIO_POLICY_FORCE_FOR_RECORD) == AUDIO_POLICY_FORCE_BT_SCO) {