diff options
| author | Vineeta Srivastava <vsrivastava@google.com> | 2014-10-07 20:03:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-07 20:03:33 +0000 |
| commit | 7c82283a3588a71cdaa598244570b6326116572d (patch) | |
| tree | 0c3c53af709bc2a55cbfc234f48be7a8c27e9753 /audio_policy.conf | |
| parent | aba7491d46235ac6e1289ab0645c590f32154c66 (diff) | |
| parent | cc7d2baf6c074fdbba0a15ac9e6c2fc12a1b099b (diff) | |
| download | shamu-7c82283a3588a71cdaa598244570b6326116572d.tar.gz | |
am cc7d2baf: am 655b09b0: Revert "disable AUDIO_DEVICE_OUT_SPEAKER_SAFE"
* commit 'cc7d2baf6c074fdbba0a15ac9e6c2fc12a1b099b':
Revert "disable AUDIO_DEVICE_OUT_SPEAKER_SAFE"
Diffstat (limited to 'audio_policy.conf')
| -rw-r--r-- | audio_policy.conf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/audio_policy.conf b/audio_policy.conf index 4def5afe..b32d5941 100644 --- a/audio_policy.conf +++ b/audio_policy.conf @@ -6,7 +6,7 @@ # "TRUE" means DRC is enabled, "FALSE" or omission means DRC isn't used. global_configuration { - attached_output_devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER + attached_output_devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_SPEAKER_SAFE default_output_device AUDIO_DEVICE_OUT_SPEAKER attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_REMOTE_SUBMIX } @@ -29,21 +29,21 @@ audio_hw_modules { sampling_rates 44100|48000 channel_masks AUDIO_CHANNEL_OUT_STEREO formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_LINE + devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_SPEAKER_SAFE flags AUDIO_OUTPUT_FLAG_PRIMARY } deep_buffer { sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000 channel_masks AUDIO_CHANNEL_OUT_STEREO formats AUDIO_FORMAT_PCM_16_BIT - devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_LINE + devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_SPEAKER_SAFE flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER } compress_offload { sampling_rates 8000|11025|16000|22050|32000|44100|48000 channel_masks AUDIO_CHANNEL_OUT_MONO|AUDIO_CHANNEL_OUT_STEREO formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_AAC - devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE + devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_SPEAKER_SAFE flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING } } |