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

Commit 0111e0fe authored by Andy Hung's avatar Andy Hung Committed by android-build-merger
Browse files

Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev... 

Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into mnc-dev am: e472e511 am: 0a8a0c44 am: ae465be4 am: b995c314 am: d08327d1 am: 74f84d98 am: 355a18f5 am: c8f3cf02 am: 8cad7241 am: 122ec92c am: fa5a0ced
am: 19f0196d

Change-Id: Ia47b4f3d752e74ba9c4bf02ccb74c33c9c5f9dd4
parents 6cebbee7 19f0196d

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -694,6 +694,7 @@ status_t AudioPolicyService::acquireSoundTriggerSession(audio_session_t *session 
                                       audio_io_handle_t *ioHandle,

                                       audio_io_handle_t *ioHandle,

                                       audio_devices_t *device)

                                       audio_devices_t *device)

{

{

    Mutex::Autolock _l(mLock);

    if (mAudioPolicyManager == NULL) {

    if (mAudioPolicyManager == NULL) {

        return NO_INIT;

        return NO_INIT;

    }

    }
@@ -703,6 +704,7 @@ status_t AudioPolicyService::acquireSoundTriggerSession(audio_session_t *session 




status_t AudioPolicyService::releaseSoundTriggerSession(audio_session_t session)

status_t AudioPolicyService::releaseSoundTriggerSession(audio_session_t session)

{

{

    Mutex::Autolock _l(mLock);

    if (mAudioPolicyManager == NULL) {

    if (mAudioPolicyManager == NULL) {

        return NO_INIT;

        return NO_INIT;

    }

    }