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

Commit 6f109ded authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7196551 from 1cd18dad to sc-release 

Change-Id: I981a83391fdba5a40e815e6836d089aa1709b901
parents f23609d9 1cd18dad

media/utils/TimeCheck.cpp

+2 −3
Original line number Diff line number Diff line
@@ -39,10 +39,9 @@ void TimeCheck::accessAudioHalPids(std::vector<pid_t>* pids, bool update) { 
    static std::atomic<int> curAudioHalPids = 0;



    if (update) {

        audioHalPids[(curAudioHalPids + 1) % kNumAudioHalPidsVectors] = *pids;

        curAudioHalPids++;

        audioHalPids[(curAudioHalPids++ + 1) % kNumAudioHalPidsVectors] = *pids;

    } else {

        *pids = audioHalPids[curAudioHalPids];

        *pids = audioHalPids[curAudioHalPids % kNumAudioHalPidsVectors];

    }

}

services/audiopolicy/service/AudioPolicyEffects.cpp

+2 −2
Original line number Diff line number Diff line
@@ -970,7 +970,7 @@ void AudioPolicyEffects::initDefaultDeviceEffects() 
    for (const auto& deviceEffectsIter : mDeviceEffects) {

        const auto& deviceEffects =  deviceEffectsIter.second;

        for (const auto& effectDesc : deviceEffects->mEffectDescriptors->mEffects) {

            auto fx = std::make_unique<AudioEffect>(String16("android"));

            sp<AudioEffect> fx = new AudioEffect(String16("android"));

            fx->set(EFFECT_UUID_NULL, &effectDesc->mUuid, 0, nullptr,

                    nullptr, AUDIO_SESSION_DEVICE, AUDIO_IO_HANDLE_NONE,

                    AudioDeviceTypeAddr{deviceEffects->getDeviceType(),
@@ -987,7 +987,7 @@ void AudioPolicyEffects::initDefaultDeviceEffects() 
            ALOGV("%s(): create Fx %s added on port type=%d address=%s", __func__,

                  effectDesc->mName, deviceEffects->getDeviceType(),

                  deviceEffects->getDeviceAddress().c_str());

            deviceEffects->mEffects.push_back(std::move(fx));

            deviceEffects->mEffects.push_back(fx);

        }

    }

}

services/audiopolicy/service/AudioPolicyEffects.h

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ private: 
            mDeviceType(device), mDeviceAddress(address) {}

        /*virtual*/ ~DeviceEffects() = default;



        std::vector<std::unique_ptr<AudioEffect>> mEffects;

        std::vector< sp<AudioEffect> > mEffects;

        audio_devices_t getDeviceType() const { return mDeviceType; }

        std::string getDeviceAddress() const { return mDeviceAddress; }

        const std::unique_ptr<EffectDescVector> mEffectDescriptors;