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

Commit 4a84252a authored by Ramjee Singh's avatar Ramjee Singh
Browse files

Revert "policy_hal: Function prototype correction for custom policy". 

This reverts commit 5b022de9

Change-Id: I90f24fbf3af0aaab309365d02893e41cc30b4087
parent eb605c95

policy_hal/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_PROXY_DEVICE)),true) 
LOCAL_CFLAGS += -DAUDIO_EXTN_AFE_PROXY_ENABLED

endif



LOCAL_CFLAGS += -Wno-error -fpermissive

LOCAL_MODULE := libaudiopolicymanager



include $(BUILD_SHARED_LIBRARY)

policy_hal/AudioPolicyManager.cpp

+2 −4
Original line number Diff line number Diff line
@@ -665,12 +665,11 @@ void AudioPolicyManagerCustom::setForceUse(audio_policy_force_use_t usage, 


}



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

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

                                            audio_stream_type_t stream,

                                            bool forceDeviceUpdate)

{

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

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

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



    // handle special case for sonification while in call
@@ -723,14 +722,13 @@ status_t AudioPolicyManagerCustom::stopSource(sp<AudioOutputDescriptor> outputDe 
        return INVALID_OPERATION;

    }

}

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

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

                                             audio_stream_type_t stream,

                                             audio_devices_t device,

                                             uint32_t *delayMs)

{

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

    uint32_t beaconMuteLatency = 0;

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



    *delayMs = 0;

    if (stream == AUDIO_STREAM_TTS) {

policy_hal/AudioPolicyManager.h

+2 −2
Original line number Diff line number Diff line
@@ -84,11 +84,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<AudioOutputDescriptor> outputDesc,

        status_t startSource(sp<SwAudioOutputDescriptor> outputDesc,

                             audio_stream_type_t stream,

                             audio_devices_t device,

                             uint32_t *delayMs);

        status_t stopSource(sp<AudioOutputDescriptor> outputDesc,

         status_t stopSource(sp<SwAudioOutputDescriptor> outputDesc,

                            audio_stream_type_t stream,

                            bool forceDeviceUpdate);

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