summaryrefslogtreecommitdiffstats
path: root/hal
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2013-09-13 01:14:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-13 01:14:02 +0000
commit37f761768f624be68495bf48cc5192695666b8f0 (patch)
tree9dd81327c54959176287462b207810e111b9aa1a /hal
parent5191a856311c5bd5a1b48810032ccdbc35a7fdc7 (diff)
parent86e1713c4eb1378823c1f544f0fea2339c08f393 (diff)
downloadandroid_hardware_qcom_audio-37f761768f624be68495bf48cc5192695666b8f0.tar.gz
android_hardware_qcom_audio-37f761768f624be68495bf48cc5192695666b8f0.tar.bz2
android_hardware_qcom_audio-37f761768f624be68495bf48cc5192695666b8f0.zip
Merge "audio: enable AAC offload" into klp-dev
Diffstat (limited to 'hal')
-rw-r--r--hal/audio_hw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 2ad5c883..9f554fa3 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -129,8 +129,8 @@ static int set_voice_volume_l(struct audio_device *adev, float volume);
static bool is_supported_format(audio_format_t format)
{
- if (format == AUDIO_FORMAT_MP3 /*||
- format == AUDIO_FORMAT_AAC */)
+ if (format == AUDIO_FORMAT_MP3 ||
+ format == AUDIO_FORMAT_AAC)
return true;
return false;