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

Commit a5e73864 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: Add support for FM and WFD features"

parents b90b0da5 88d28cba

policy_hal/Android.mk

+10 −0
Original line number Diff line number Diff line
@@ -20,6 +20,16 @@ LOCAL_MODULE := audio_policy.$(TARGET_BOARD_PLATFORM) 
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw

LOCAL_MODULE_TAGS := optional



ifneq ($(strip $(AUDIO_FEATURE_DISABLED_FM)),true)

LOCAL_CFLAGS += -DAUDIO_EXTN_FM_ENABLED

endif

ifneq ($(strip $(AUDIO_FEATURE_DISABLED_PROXY_DEVICE)),true)

LOCAL_CFLAGS += -DAUDIO_EXTN_AFE_PROXY_ENABLED

endif

ifneq ($(strip $(AUDIO_FEATURE_DISABLED_INCALL_MUSIC)),true)

LOCAL_CFLAGS += -DAUDIO_EXTN_INCALL_MUSIC_ENABLED

endif



include $(BUILD_SHARED_LIBRARY)



endif

policy_hal/AudioPolicyManager.cpp

+621 −7

File changed.

Preview size limit exceeded, changes collapsed.

policy_hal/AudioPolicyManager.h

+25 −0
Original line number Diff line number Diff line
@@ -39,7 +39,19 @@ public: 


        virtual ~AudioPolicyManager() {}



        virtual status_t setDeviceConnectionState(audio_devices_t device,

                                                          AudioSystem::device_connection_state state,

                                                          const char *device_address);

        virtual void setForceUse(AudioSystem::force_use usage, AudioSystem::forced_config config);

        virtual audio_io_handle_t getInput(int inputSource,

                                            uint32_t samplingRate,

                                            uint32_t format,

                                            uint32_t channels,

                                            AudioSystem::audio_in_acoustics acoustics);

protected:

        // return the strategy corresponding to a given stream type

        static routing_strategy getStrategy(AudioSystem::stream_type stream);



        // return appropriate device for streams handled by the specified strategy according to current

        // phone state, connected devices...

        // if fromCache is true, the device is returned from mDeviceForStrategy[],
@@ -53,5 +65,18 @@ protected: 
        //  before updateDevicesAndOutputs() is called.

        virtual audio_devices_t getDeviceForStrategy(routing_strategy strategy,

                                                     bool fromCache = true);

        // select input device corresponding to requested audio source

        virtual audio_devices_t getDeviceForInputSource(int inputSource);



        // compute the actual volume for a given stream according to the requested index and a particular

        // device

        virtual float computeVolume(int stream, int index, audio_io_handle_t output, audio_devices_t device);



        // check that volume change is permitted, compute and send new volume to audio hardware

        status_t checkAndSetVolume(int stream, int index, audio_io_handle_t output, audio_devices_t device, int delayMs = 0, bool force = false);



        // returns the category the device belongs to with regard to volume curve management

        static device_category getDeviceCategory(audio_devices_t device);



};

};