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

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

Merge changes I3e3cbc53,I2a1828d9 am: 132e839c am: e1c41ed7 

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



Change-Id: I1fedf5dda6e4c9a6c756fa5b89fb1b194576da6e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2d240caf e1c41ed7

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
@@ -373,6 +373,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) {