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

Commit 4162873e authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

Audio policy: fix crash in absence of spatializer 

Check for null pointer when registering the callback for
the spatializer.

Bug: 188502620
Test: boot w/o crashing on device w/o spatializer support
Change-Id: I71a1e31e00cf513aafafcb341b79d70859ce7f1b
parent b13c6854

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

+5 −2
Original line number Diff line number Diff line
@@ -2210,8 +2210,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();

}