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

Commit 9c7d1abc authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "AudioSystem: Improve consistency checking for AudioFlinger service" into main

parents 6bf87b6a fd745f28

media/libaudioclient/AudioSystem.cpp

+11 −3
Original line number Diff line number Diff line
@@ -238,9 +238,12 @@ public: 
            ALOGW_IF(old != mService,

                    "%s: service changed during callback, continuing.", __func__);

        }

        mService = af;

        if (af) {

            ul.unlock();

        if (af) onNewServiceWithAdapter(af);

            onNewServiceWithAdapter(af);

        } else {

            mService = nullptr;

        }

        return OK;

    }
@@ -270,6 +273,11 @@ private: 
        bool reportNoError = false;

        {

            std::lock_guard l(mMutex);

            if (mService == service ||

                    (mService && service && mService->getDelegate() == service->getDelegate())) {

                ALOGW("%s: %s  same service, ignoring", __func__, getServiceName());

                return;

            }

            ALOGW_IF(mValid, "%s: %s service already valid, continuing with initialization",

                    __func__, getServiceName());

            if (mClient == nullptr) {