diff options
| -rw-r--r-- | BoardCommonConfig.mk | 1 | ||||
| -rw-r--r-- | common.mk | 3 | ||||
| -rw-r--r-- | configs/audio_policy.conf | 52 |
3 files changed, 2 insertions, 54 deletions
diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk index ebf0ba5..822d854 100644 --- a/BoardCommonConfig.mk +++ b/BoardCommonConfig.mk @@ -95,6 +95,7 @@ BOARD_USES_MFC_FPS := true BOARD_USE_YAMAHAPLAYER := true BOARD_USE_SAMSUNG_SEPARATEDSTREAM := true BOARD_HAS_SAMSUNG_VOLUME_BUG := true +COMMON_GLOBAL_CFLAGS += -DICS_AUDIO_BLOB # RIL BOARD_MOBILEDATA_INTERFACE_NAME := "pdp0" @@ -24,8 +24,7 @@ PRODUCT_COPY_FILES := \ # Audio PRODUCT_COPY_FILES += \ - device/samsung/galaxys2-common/configs/asound.conf:system/etc/asound.conf \ - device/samsung/galaxys2-common/configs/audio_policy.conf:system/etc/audio_policy.conf + device/samsung/galaxys2-common/configs/asound.conf:system/etc/asound.conf # Vold and Storage PRODUCT_COPY_FILES += \ diff --git a/configs/audio_policy.conf b/configs/audio_policy.conf deleted file mode 100644 index 669d2d1..0000000 --- a/configs/audio_policy.conf +++ /dev/null @@ -1,52 +0,0 @@ -# Global configuration section: lists input and output devices always present on the device -# as well as the output device selected by default. -# Devices are designated by a string that corresponds to the enum in audio.h - -global_configuration { - attached_output_devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER - default_output_device AUDIO_DEVICE_OUT_SPEAKER - attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_VOICE_CALL -} - -# audio hardware module section: contains descriptors for all audio hw modules present on the -# device. Each hw module node is named after the corresponding hw module library base name. -# For instance, "primary" corresponds to audio.primary.<device>.so. -# The "primary" module is mandatory and must include at least one output with -# AUDIO_OUTPUT_FLAG_PRIMARY flag. -# Each module descriptor contains one or more output profile descriptors and zero or more -# input profile descriptors. Each profile lists all the parameters supported by a given output -# or input stream category. -# The "channel_masks", "formats", "devices" and "flags" are specified using strings corresponding -# to enums in audio.h and audio_policy.h. They are concatenated by use of "|" without space or "\n". - -audio_hw_modules { - primary { - outputs { - primary { - sampling_rates 44100 - channel_masks AUDIO_CHANNEL_OUT_STEREO - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET|AUDIO_DEVICE_OUT_AUX_DIGITAL|AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET - flags AUDIO_OUTPUT_FLAG_PRIMARY - } - } - inputs { - primary { - sampling_rates 8000|11025|16000|22050|24000|32000|44100|48000 - channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_FM|AUDIO_DEVICE_IN_VOICE_CALL - } - } - } - a2dp { - outputs { - a2dp { - sampling_rates 44100 - channel_masks AUDIO_CHANNEL_OUT_STEREO - formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_ALL_A2DP - } - } - } -} |