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

Commit bce7cd48 authored by Francois Gaffie's avatar Francois Gaffie Committed by Eric Laurent
Browse files

audiopolicy: Primary Output runtime management 



In case of unavailability of device(s) attached to the primary output,
this output can be disconnected.
The cache variable must be resetted, then restored when at least one
device supported by one profile of the primary output is made
available again.

Test: adb shell /data/nativetest64/AudioPolicyEmulatorTests/AudioPolicyEmulatorTests --gtest_filter=AudioSourceTest*

Signed-off-by: default avatarFrancois Gaffie <francois.gaffie@renault.com>
Change-Id: Iae8937cad3d70b0e8c7ff4516c27aa8eff231eaa
parent a0e5c997

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+11 −6
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ status_t AudioPolicyManager::handleDeviceConfigChange(audio_devices_t device, 
    // Case 1: A2DP active device switches from primary to primary

    // module

    // Case 2: A2DP device config changes on primary module.

    if (audio_is_a2dp_out_device(device)) {

    if (audio_is_a2dp_out_device(device) && hasPrimaryOutput()) {

        sp<HwModule> module = mHwModules.getModuleForDeviceType(device, encodedFormat);

        audio_module_handle_t primaryHandle = mPrimaryOutput->getModuleHandle();

        if (availablePrimaryOutputDevices().contains(devDesc) &&
@@ -4738,10 +4738,7 @@ status_t AudioPolicyManager::initialize() { 
        }

    }



    if (mPrimaryOutput == 0) {

        ALOGE("Failed to open primary output");

        status = NO_INIT;

    }

    ALOGW_IF(mPrimaryOutput == nullptr, "The policy configuration does not declare a primary output");



    // Silence ALOGV statements

    property_set("log.tag." LOG_TAG, "D");
@@ -4851,7 +4848,7 @@ void AudioPolicyManager::onNewAudioModulesAvailableInt(DeviceVector *newDevices) 
                    setEngineDeviceConnectionState(device, AUDIO_POLICY_DEVICE_STATE_AVAILABLE);

                }

            }

            if (mPrimaryOutput == 0 &&

            if (mPrimaryOutput == nullptr &&

                    outProfile->getFlags() & AUDIO_OUTPUT_FLAG_PRIMARY) {

                mPrimaryOutput = outputDesc;

            }
@@ -4928,6 +4925,10 @@ void AudioPolicyManager::addOutput(audio_io_handle_t output, 


void AudioPolicyManager::removeOutput(audio_io_handle_t output)

{

    if (mPrimaryOutput != 0 && mPrimaryOutput == mOutputs.valueFor(output)) {

        ALOGV("%s: removing primary output", __func__);

        mPrimaryOutput = nullptr;

    }

    mOutputs.removeItem(output);

    selectOutputForMusicEffects();

}
@@ -6853,6 +6854,10 @@ sp<SwAudioOutputDescriptor> AudioPolicyManager::openOutputWithProfileAndDevice( 
            return nullptr;

        }

    }

    if (mPrimaryOutput == nullptr && profile->getFlags() & AUDIO_OUTPUT_FLAG_PRIMARY) {

        ALOGV("%s(): re-assigning mPrimaryOutput", __func__);

        mPrimaryOutput = desc;

    }

    return desc;

}