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

Commit d0fded31 authored by Phil Burk's avatar Phil Burk Committed by Android (Google) Code Review
Browse files

Merge "[audio][policy] fix crash when offloadInfo is NULL" into lmp-dev

parents c2320223 77cce80f

services/audiopolicy/AudioPolicyManager.cpp

+6 −2
Original line number Diff line number Diff line
@@ -709,7 +709,9 @@ audio_io_handle_t AudioPolicyManager::getOutputForDevice( 
            config.sample_rate = mTestSamplingRate;

            config.channel_mask = mTestChannels;

            config.format = mTestFormat;

            if (offloadInfo != NULL) {

                config.offload_info = *offloadInfo;

            }

            status = mpClientInterface->openOutput(0,

                                                  &mTestOutputs[mCurOutput],

                                                  &config,
@@ -784,7 +786,9 @@ audio_io_handle_t AudioPolicyManager::getOutputForDevice( 
        config.sample_rate = samplingRate;

        config.channel_mask = channelMask;

        config.format = format;

        if (offloadInfo != NULL) {

            config.offload_info = *offloadInfo;

        }

        status = mpClientInterface->openOutput(profile->mModule->mHandle,

                                               &output,

                                               &config,