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

Commit 296499d8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Audio policy: fix crash in absence of spatializer" into sc-v2-dev am: 48e5af7a 

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

Change-Id: I1f623f082351109c80ff598acf9af4611cd78364
parents 9deca1cf 48e5af7a

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

+5 −2
Original line number Diff line number Diff line
@@ -2224,8 +2224,11 @@ Status AudioPolicyService::getSpatializer( 
        media::GetSpatializerResponse* _aidl_return) {

    _aidl_return->spatializer = nullptr;

    LOG_ALWAYS_FATAL_IF(callback == nullptr);

    RETURN_IF_BINDER_ERROR(binderStatusFromStatusT(mSpatializer->registerCallback(callback)));

    if (mSpatializer != nullptr) {

        RETURN_IF_BINDER_ERROR(

                binderStatusFromStatusT(mSpatializer->registerCallback(callback)));

        _aidl_return->spatializer = mSpatializer;

    }

    return Status::ok();

}