| commit | 37f761768f624be68495bf48cc5192695666b8f0 | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Fri Sep 13 01:14:02 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Sep 13 01:14:02 2013 +0000 |
| tree | 9dd81327c54959176287462b207810e111b9aa1a | |
| parent | 5191a856311c5bd5a1b48810032ccdbc35a7fdc7 [diff] | |
| parent | 86e1713c4eb1378823c1f544f0fea2339c08f393 [diff] |
Merge "audio: enable AAC offload" into klp-dev
diff --git a/hal/audio_hw.c b/hal/audio_hw.c index 2ad5c88..9f554fa 100644 --- a/hal/audio_hw.c +++ b/hal/audio_hw.c
@@ -129,8 +129,8 @@ 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;