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

Commit 61ab7b5e authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "Spatializer: enforce only one client registered" into tm-qpr-dev am:... 

Merge "Spatializer: enforce only one client registered" into tm-qpr-dev am: 40b989aa am: eec8e1b6

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



Change-Id: I96ae5675f2003fe3991722cf237f1773bb72f2b7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d5eca99f eec8e1b6

services/audiopolicy/service/AudioPolicyService.cpp

+2 −1
Original line number Diff line number Diff line
@@ -516,7 +516,8 @@ void AudioPolicyService::onCheckSpatializer_l() 


void AudioPolicyService::doOnCheckSpatializer()

{

    ALOGI("%s mSpatializer %p level %d", __func__, mSpatializer.get(), (int)mSpatializer->getLevel());

    ALOGV("%s mSpatializer %p level %d",

        __func__, mSpatializer.get(), (int)mSpatializer->getLevel());



    if (mSpatializer != nullptr) {

        // Note: mSpatializer != nullptr =>  mAudioPolicyManager != nullptr

services/audiopolicy/service/Spatializer.cpp

+11 −0
Original line number Diff line number Diff line
@@ -403,6 +403,17 @@ status_t Spatializer::registerCallback( 
        return BAD_VALUE;

    }



    if (mSpatializerCallback != nullptr) {

        if (IInterface::asBinder(callback) == IInterface::asBinder(mSpatializerCallback)) {

            ALOGW("%s: Registering callback %p again",

                __func__, mSpatializerCallback.get());

            return NO_ERROR;

        }

        ALOGE("%s: Already one client registered with callback %p",

            __func__, mSpatializerCallback.get());

        return INVALID_OPERATION;

    }



    sp<IBinder> binder = IInterface::asBinder(callback);

    status_t status = binder->linkToDeath(this);

    if (status == NO_ERROR) {