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

Commit db860895 authored by Tom Briden's avatar Tom Briden Committed by Ricardo Cerqueira
Browse files

Added ifndef ICS_AUDIO_BLOB around non-existent functions (3/3) 

For older audio blobs where is_source_active and is_stream_active_remotely
doesn't exist, receiving a notification and dumpsys crashes the audio service.

Change-Id: I554f00ba7f171d2ea91627cae2281623383b3ca7
parent 84be04d5

services/audioflinger/AudioPolicyService.cpp

+7 −0
Original line number Original line Diff line number Diff line
@@ -521,15 +521,19 @@ bool AudioPolicyService::isStreamActive(audio_stream_type_t stream, uint32_t inP 




bool AudioPolicyService::isStreamActiveRemotely(audio_stream_type_t stream, uint32_t inPastMs) const

bool AudioPolicyService::isStreamActiveRemotely(audio_stream_type_t stream, uint32_t inPastMs) const

{

{

#ifndef ICS_AUDIO_BLOB

    if (mpAudioPolicy == NULL) {

    if (mpAudioPolicy == NULL) {

        return 0;

        return 0;

    }

    }

    Mutex::Autolock _l(mLock);

    Mutex::Autolock _l(mLock);

    return mpAudioPolicy->is_stream_active_remotely(mpAudioPolicy, stream, inPastMs);

    return mpAudioPolicy->is_stream_active_remotely(mpAudioPolicy, stream, inPastMs);

#endif

    return 0;

}

}





bool AudioPolicyService::isSourceActive(audio_source_t source) const

bool AudioPolicyService::isSourceActive(audio_source_t source) const

{

{

#ifndef ICS_AUDIO_BLOB

    if (mpAudioPolicy == NULL) {

    if (mpAudioPolicy == NULL) {

        return false;

        return false;

    }

    }
@@ -538,6 +542,9 @@ bool AudioPolicyService::isSourceActive(audio_source_t source) const 
    }

    }

    Mutex::Autolock _l(mLock);

    Mutex::Autolock _l(mLock);

    return mpAudioPolicy->is_source_active(mpAudioPolicy, source);

    return mpAudioPolicy->is_source_active(mpAudioPolicy, source);

#else

    return false;

#endif

}

}





status_t AudioPolicyService::queryDefaultPreProcessing(int audioSession,

status_t AudioPolicyService::queryDefaultPreProcessing(int audioSession,