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

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

Merge "Fix mic address augmenting in APM" am: d1500dea am: e75bc7c0 am: a019f2a7 

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



Change-Id: Ie00a9785da7fe5e286ad6d64339cb5d0d10cdff5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 205d1715 a019f2a7

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+11 −11
Original line number Diff line number Diff line
@@ -6004,6 +6004,17 @@ status_t AudioPolicyManager::initialize() { 
        return status;

    }



    // If microphones address is empty, set it according to device type

    for (size_t i = 0; i < mInputDevicesAll.size(); i++) {

        if (mInputDevicesAll[i]->address().empty()) {

            if (mInputDevicesAll[i]->type() == AUDIO_DEVICE_IN_BUILTIN_MIC) {

                mInputDevicesAll[i]->setAddress(AUDIO_BOTTOM_MICROPHONE_ADDRESS);

            } else if (mInputDevicesAll[i]->type() == AUDIO_DEVICE_IN_BACK_MIC) {

                mInputDevicesAll[i]->setAddress(AUDIO_BACK_MICROPHONE_ADDRESS);

            }

        }

    }



    mEngine->updateDeviceSelectionCache();

    mCommunnicationStrategy = mEngine->getProductStrategyForAttributes(

        mEngine->getAttributesForStreamType(AUDIO_STREAM_VOICE_CALL));
@@ -6018,17 +6029,6 @@ status_t AudioPolicyManager::initialize() { 
                 mDefaultOutputDevice->toString().c_str());

        status = NO_INIT;

    }

    // If microphones address is empty, set it according to device type

    for (size_t i = 0; i < mAvailableInputDevices.size(); i++) {

        if (mAvailableInputDevices[i]->address().empty()) {

            if (mAvailableInputDevices[i]->type() == AUDIO_DEVICE_IN_BUILTIN_MIC) {

                mAvailableInputDevices[i]->setAddress(AUDIO_BOTTOM_MICROPHONE_ADDRESS);

            } else if (mAvailableInputDevices[i]->type() == AUDIO_DEVICE_IN_BACK_MIC) {

                mAvailableInputDevices[i]->setAddress(AUDIO_BACK_MICROPHONE_ADDRESS);

            }

        }

    }



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



    // Silence ALOGV statements