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

Commit 0ffa711d authored by Dhananjay Kumar's avatar Dhananjay Kumar
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.

Change-Id: I6fe8fd6890ee8e896b6430f3ad170850d77b17d5
parent c7bc8490

policy_hal/AudioPolicyManager.cpp

+19 −6
Original line number Diff line number Diff line
@@ -962,18 +962,22 @@ void AudioPolicyManagerCustom::setForceUse(audio_policy_force_use_t usage, 


}



status_t AudioPolicyManagerCustom::stopSource(sp<SwAudioOutputDescriptor> outputDesc,

status_t AudioPolicyManagerCustom::stopSource(sp<AudioOutputDescriptor> outputDesc,

                                            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

    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()) {

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

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

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

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

        }

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

    }
@@ -1008,7 +1012,7 @@ status_t AudioPolicyManagerCustom::stopSource(sp<SwAudioOutputDescriptor> output 
                        if (dev == prevDevice) {

                            delayMs = 0;

                        } else {

                            delayMs = outputDesc->mLatency*2;

                            delayMs = outputDesc->latency()*2;

                        }

                        setOutputDevice(desc,

                                    dev,
@@ -1025,7 +1029,7 @@ status_t AudioPolicyManagerCustom::stopSource(sp<SwAudioOutputDescriptor> output 
        return INVALID_OPERATION;

    }

}

status_t AudioPolicyManagerCustom::startSource(sp<SwAudioOutputDescriptor> outputDesc,

status_t AudioPolicyManagerCustom::startSource(sp<AudioOutputDescriptor> outputDesc,

                                             audio_stream_type_t stream,

                                             audio_devices_t device,

                                             uint32_t *delayMs)
@@ -1033,6 +1037,11 @@ status_t AudioPolicyManagerCustom::startSource(sp<SwAudioOutputDescriptor> outpu 
    // 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;

    }



    *delayMs = 0;

    if (stream == AUDIO_STREAM_TTS) {

        ALOGV("\t found BEACON stream");
@@ -1176,10 +1185,14 @@ void AudioPolicyManagerCustom::handleNotificationRoutingForStream(audio_stream_t 
}

status_t AudioPolicyManagerCustom::checkAndSetVolume(audio_stream_type_t stream,

                                                   int index,

                                                   const sp<SwAudioOutputDescriptor>& outputDesc,

                                                   const sp<AudioOutputDescriptor>& outputDesc,

                                                   audio_devices_t device,

                                                   int delayMs, bool force)

{

    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

+3 −3
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ protected: 


         status_t checkAndSetVolume(audio_stream_type_t stream,

                                                   int index,

                                                   const sp<SwAudioOutputDescriptor>& outputDesc,

                                                   const sp<AudioOutputDescriptor>& outputDesc,

                                                   audio_devices_t device,

                                                   int delayMs = 0, bool force = false);
@@ -94,11 +94,11 @@ protected: 


        // if argument "device" is different from AUDIO_DEVICE_NONE,  startSource() will force

        // the re-evaluation of the output device.

        status_t startSource(sp<SwAudioOutputDescriptor> outputDesc,

        status_t startSource(sp<AudioOutputDescriptor> outputDesc,

                             audio_stream_type_t stream,

                             audio_devices_t device,

                             uint32_t *delayMs);

         status_t stopSource(sp<SwAudioOutputDescriptor> outputDesc,

         status_t stopSource(sp<AudioOutputDescriptor> outputDesc,

                            audio_stream_type_t stream,

                            bool forceDeviceUpdate);

        // event is one of STARTING_OUTPUT, STARTING_BEACON, STOPPING_OUTPUT, STOPPING_BEACON