commit 7fa48c272e2aba35dcef005a19148b27826e0171
author Vineeta Srivastava <vsrivastava@google.com> Fri Jul 25 07:31:59 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 24 20:48:02 2014 +0000
tree 93f5af45c74a443e971f93d7b1b1ef029f0dd309
parent 8251ac85bf0c688d6043df3cb3f45d4082e62bc4
parent a237ecc29c7a2f22d01bc202a3daffe5856d73e4

Merge "hal: use correct voice call use case id" into lmp-dev

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 6445131..a8cc733 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -142,10 +142,15 @@
 
 static bool is_supported_format(audio_format_t format)
 {
-    if (format == AUDIO_FORMAT_MP3 ||
-            format == AUDIO_FORMAT_AAC)
-        return true;
-
+    switch (format) {
+        case AUDIO_FORMAT_MP3:
+        case AUDIO_FORMAT_AAC_LC:
+        case AUDIO_FORMAT_AAC_HE_V1:
+        case AUDIO_FORMAT_AAC_HE_V2:
+            return true;
+        default:
+            break;
+    }
     return false;
 }
 
@@ -153,7 +158,7 @@
 {
     int id = 0;
 
-    switch (format) {
+    switch (format & AUDIO_FORMAT_MAIN_MASK) {
     case AUDIO_FORMAT_MP3:
         id = SND_AUDIOCODEC_MP3;
         break;

hal/voice.c

diff --git a/hal/voice.c b/hal/voice.c
index cc509af..c63c525 100644
--- a/hal/voice.c
+++ b/hal/voice.c
@@ -369,8 +369,13 @@
     ALOGV_IF(kv_pairs != NULL, "%s: enter: %s", __func__, kv_pairs);
 
     ret = voice_extn_set_parameters(adev, parms);
-    if (ret != 0)
-        goto done;
+    if (ret != 0) {
+        if (ret == -ENOSYS) {
+            ret = 0; /* ignore error */
+        } else {
+            goto done;
+        }
+    }
 
     err = str_parms_get_str(parms, AUDIO_PARAMETER_KEY_TTY_MODE, value, sizeof(value));
     if (err >= 0) {