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

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

Merge "Revert "audio policy: fix regression in A2DP playback""

parents 44804b4c 460451e5

services/audiopolicy/common/managerdefinitions/src/AudioInputDescriptor.cpp

+0 −3
Original line number Original line Diff line number Diff line
@@ -249,9 +249,6 @@ void AudioInputDescriptor::close() 
        mClientInterface->closeInput(mIoHandle);

        mClientInterface->closeInput(mIoHandle);

        LOG_ALWAYS_FATAL_IF(mProfile->curOpenCount < 1, "%s profile open count %u",

        LOG_ALWAYS_FATAL_IF(mProfile->curOpenCount < 1, "%s profile open count %u",

                            __FUNCTION__, mProfile->curOpenCount);

                            __FUNCTION__, mProfile->curOpenCount);

        if (isActive()) {

            mProfile->curActiveCount--;

        }

        mProfile->curOpenCount--;

        mProfile->curOpenCount--;

        mIoHandle = AUDIO_IO_HANDLE_NONE;

        mIoHandle = AUDIO_IO_HANDLE_NONE;

    }

    }

services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp

+0 −3
Original line number Original line Diff line number Diff line
@@ -462,9 +462,6 @@ void SwAudioOutputDescriptor::close() 




        LOG_ALWAYS_FATAL_IF(mProfile->curOpenCount < 1, "%s profile open count %u",

        LOG_ALWAYS_FATAL_IF(mProfile->curOpenCount < 1, "%s profile open count %u",

                            __FUNCTION__, mProfile->curOpenCount);

                            __FUNCTION__, mProfile->curOpenCount);

        if (isActive()) {

            mProfile->curActiveCount--;

        }

        mProfile->curOpenCount--;

        mProfile->curOpenCount--;

        mIoHandle = AUDIO_IO_HANDLE_NONE;

        mIoHandle = AUDIO_IO_HANDLE_NONE;

    }

    }