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

Commit a78a183c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "policy-hal: extend getDeviceForStrategy for WFD use-cases"

parents a6188c0c c60f6fab

policy_hal/Android.mk

+16 −0
Original line number Diff line number Diff line
@@ -27,6 +27,22 @@ LOCAL_SHARED_LIBRARIES := \ 
LOCAL_STATIC_LIBRARIES := \

    libmedia_helper \



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_VOICE_CONCURRENCY)),true)

LOCAL_CFLAGS += -DVOICE_CONCURRENCY

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_RECORD_PLAY_CONCURRENCY)),true)

LOCAL_CFLAGS += -DRECORD_PLAY_CONCURRENCY

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_PCM_OFFLOAD)),true)

    LOCAL_CFLAGS += -DPCM_OFFLOAD_ENABLED

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_PCM_OFFLOAD_24)),true)

       LOCAL_CFLAGS += -DPCM_OFFLOAD_ENABLED_24

endif



LOCAL_MODULE := libaudiopolicymanager



include $(BUILD_SHARED_LIBRARY)

policy_hal/AudioPolicyManager.cpp

+699 −23

File changed.

Preview size limit exceeded, changes collapsed.

policy_hal/AudioPolicyManager.h

+27 −5
Original line number Diff line number Diff line
@@ -50,10 +50,7 @@ class AudioPolicyManagerCustom: public AudioPolicyManager 
{



public:

                AudioPolicyManagerCustom(AudioPolicyClientInterface *clientInterface)

                : AudioPolicyManager(clientInterface) {

                    mHdmiAudioDisabled = false;

                    mHdmiAudioEvent = false;}

        AudioPolicyManagerCustom(AudioPolicyClientInterface *clientInterface);



        virtual ~AudioPolicyManagerCustom() {}
@@ -66,7 +63,23 @@ public: 


        virtual bool isOffloadSupported(const audio_offload_info_t& offloadInfo);



        // true if given state represents a device in a telephony or VoIP call

        virtual status_t getInputForAttr(const audio_attributes_t *attr,

                                         audio_io_handle_t *input,

                                         audio_session_t session,

                                         uid_t uid,

                                         uint32_t samplingRate,

                                         audio_format_t format,

                                         audio_channel_mask_t channelMask,

                                         audio_input_flags_t flags,

                                         audio_port_handle_t selectedDeviceId,

                                         input_type_t *inputType);

        // indicates to the audio policy manager that the input starts being used.

        virtual status_t startInput(audio_io_handle_t input,

                                    audio_session_t session);

        // indicates to the audio policy manager that the input stops being used.

        virtual status_t stopInput(audio_io_handle_t input,

                                   audio_session_t session);

        virtual audio_devices_t getDeviceForStrategy(routing_strategy strategy, bool fromCache);

protected:



         status_t checkAndSetVolume(audio_stream_type_t stream,
@@ -98,6 +111,10 @@ protected: 
        //   the mute/unmute happened 315

        uint32_t handleEventForBeacon(int){return 0;}

        uint32_t setBeaconMute(bool){return 0;}

#ifdef VOICE_CONCURRENCY

        static audio_output_flags_t getFallBackPath();

        int mFallBackflag;

#endif /*VOICE_CONCURRENCY*/



        // handle special cases for sonification strategy while in call: mute streams or replace by

        // a special tone in the device used for communication
@@ -128,6 +145,11 @@ private: 
        // Used for voip + voice concurrency usecase

        int mPrevPhoneState;

        int mvoice_call_state;

#ifdef RECORD_PLAY_CONCURRENCY

        // Used for record + playback concurrency

        bool mIsInputRequestOnProgress;

#endif





};