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

Commit 7c418f9f authored by Ramjee Singh's avatar Ramjee Singh
Browse files

audio_policy: modify few methods to appropriately override base 

Few methods in AudioPolicyManagerCustom is not overriding its
base implemenation due to signature mismatch. Since they act
as separate method they are not getting called to override
base implemenation.
Correct signatures to implement overriding instead of overloading.
Remove custom stopOutput implementation since it is not adding
any change w.r.t. base implementation.

Change-Id: I68816eeb95342b574b34a76df9c6ad110f14823d
parent ee8068c5

policy_hal/Android.mk

+6 −1
Original line number Diff line number Diff line
@@ -51,7 +51,12 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_COMPRESS_VOIP)),true) 
    LOCAL_CFLAGS += -DCOMPRESS_VOIP_ENABLED

endif



ifeq ($(strip $(AUDIO_FEATURE_NON_WEARABLE_TARGET)),true)

    LOCAL_CFLAGS += -DNON_WEARABLE_TARGET

else

    LOCAL_CFLAGS += -Wno-error -fpermissive

endif



LOCAL_MODULE := libaudiopolicymanager



include $(BUILD_SHARED_LIBRARY)

policy_hal/AudioPolicyManager.cpp

+38 −1
Original line number Diff line number Diff line
@@ -957,15 +957,29 @@ status_t AudioPolicyManagerCustom::stopSource(sp<AudioOutputDescriptor> outputDe 
                                            audio_stream_type_t stream,

                                            bool forceDeviceUpdate)

{

    if (stream < 0 || stream >= AUDIO_STREAM_CNT) {

        ALOGW("stopSource() invalid stream %d", stream);

        return INVALID_OPERATION;

    }



    // always handle stream stop, check which stream type is stopping

#ifdef NON_WEARABLE_TARGET

    sp<AudioOutputDescriptor> outputDesc = outputDesc1;

#else

    sp<SwAudioOutputDescriptor> outputDesc = (sp<SwAudioOutputDescriptor>) outputDesc1;

#endif

    handleEventForBeacon(stream == AUDIO_STREAM_TTS ? STOPPING_BEACON : STOPPING_OUTPUT);



    // handle special case for sonification while in call

    if (isInCall() && (outputDesc->mRefCount[stream] == 1)) {

        if (outputDesc->isDuplicated()) {

#ifdef NON_WEARABLE_TARGET

            handleIncallSonification(stream, false, false, outputDesc->subOutput1()->mIoHandle);

            handleIncallSonification(stream, false, false, outputDesc->subOutput2()->mIoHandle);

#else

            handleIncallSonification(stream, false, false, outputDesc->mOutput1->mIoHandle);

            handleIncallSonification(stream, false, false, outputDesc->mOutput2->mIoHandle);

#endif

        }

        handleIncallSonification(stream, false, false, outputDesc->mIoHandle);

    }
@@ -1017,7 +1031,16 @@ status_t AudioPolicyManagerCustom::startSource(sp<AudioOutputDescriptor> outputD 
{

    // cannot start playback of STREAM_TTS if any other output is being used

    uint32_t beaconMuteLatency = 0;

    if (stream < 0 || stream >= AUDIO_STREAM_CNT) {

        ALOGW("startSource() invalid stream %d", stream);

        return INVALID_OPERATION;

    }



#ifdef NON_WEARABLE_TARGET

    sp<AudioOutputDescriptor> outputDesc = outputDesc1;

#else

    sp<SwAudioOutputDescriptor> outputDesc = (sp<SwAudioOutputDescriptor>) outputDesc1;

#endif



    *delayMs = 0;

    if (stream == AUDIO_STREAM_TTS) {
@@ -1160,12 +1183,26 @@ void AudioPolicyManagerCustom::handleNotificationRoutingForStream(audio_stream_t 
        break;

    }

}

#ifdef NON_WEARABLE_TARGET

status_t AudioPolicyManagerCustom::checkAndSetVolume(audio_stream_type_t stream,

                                                   int index,

                                                   const sp<AudioOutputDescriptor>& outputDesc,

                                                   audio_devices_t device,

                                                   int delayMs, bool force)

#else

status_t AudioPolicyManagerCustom::checkAndSetVolume(audio_stream_type_t stream,

                                                    int index,

                                                    const sp<SwAudioOutputDescriptor>& outputDesc,

                                                    audio_devices_t device,

                                                    int delayMs, bool force)



#endif

{

    if (stream < 0 || stream >= AUDIO_STREAM_CNT) {

        ALOGW("checkAndSetVolume() invalid stream %d", stream);

        return INVALID_OPERATION;

    }



    // do not change actual stream volume if the stream is muted

    if (outputDesc->mMuteCount[stream] != 0) {

        ALOGVV("checkAndSetVolume() stream %d muted count %d",

policy_hal/AudioPolicyManager.h

+8 −0
Original line number Diff line number Diff line
@@ -82,11 +82,19 @@ public: 


protected:



#ifdef NON_WEARABLE_TARGET

         status_t checkAndSetVolume(audio_stream_type_t stream,

                                                    int index,

                                                    const sp<AudioOutputDescriptor>& outputDesc,

                                                    audio_devices_t device,

                                                    int delayMs = 0, bool force = false);

#else

         status_t checkAndSetVolume(audio_stream_type_t stream,

                                                   int index,

                                                   const sp<SwAudioOutputDescriptor>& outputDesc,

                                                   audio_devices_t device,

                                                   int delayMs = 0, bool force = false);

#endif



        // selects the most appropriate device on output for current state

        // must be called every time a condition that affects the device choice for a given output is