commit 4920d3856ef7e8d678329d88276b5dcc78a6aa23
author Eric Laurent <elaurent@google.com> Mon Sep 15 17:40:40 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 15 17:40:40 2014 +0000
tree 74ab00083dc612035f97e75b8e4658ce182ca923
parent 6402646dbd962f62c37abbb1d435907d54da77dd
parent 7b2b5ab2921c4679455faa3bfbeb1457e5eb5f0d

Merge "audio: fix mic mute for SIP calls" into lmp-dev

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 51a3ed6..7d5456f 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -240,7 +240,7 @@
 
     strcpy(mixer_path, use_case_table[usecase->id]);
     platform_add_backend_name(adev->platform, mixer_path, snd_device);
-    ALOGV("%s: apply and update mixer path: %s", __func__, mixer_path);
+    ALOGD("%s: apply and update mixer path: %s", __func__, mixer_path);
     audio_route_apply_and_update_path(adev->audio_route, mixer_path);
 
     ALOGV("%s: exit", __func__);
@@ -263,7 +263,7 @@
         snd_device = usecase->out_snd_device;
     strcpy(mixer_path, use_case_table[usecase->id]);
     platform_add_backend_name(adev->platform, mixer_path, snd_device);
-    ALOGV("%s: reset and update mixer path: %s", __func__, mixer_path);
+    ALOGD("%s: reset and update mixer path: %s", __func__, mixer_path);
     audio_route_reset_and_update_path(adev->audio_route, mixer_path);
 
     ALOGV("%s: exit", __func__);
@@ -292,7 +292,7 @@
     }
 
     const char * dev_path = platform_get_snd_device_name(snd_device);
-    ALOGV("%s: snd_device(%d: %s)", __func__, snd_device, dev_path);
+    ALOGD("%s: snd_device(%d: %s)", __func__, snd_device, dev_path);
     audio_route_apply_and_update_path(adev->audio_route, dev_path);
 
     return 0;
@@ -313,8 +313,7 @@
     adev->snd_dev_ref_cnt[snd_device]--;
     if (adev->snd_dev_ref_cnt[snd_device] == 0) {
         const char * dev_path = platform_get_snd_device_name(snd_device);
-        ALOGV("%s: snd_device(%d: %s)", __func__,
-              snd_device, dev_path);
+        ALOGD("%s: snd_device(%d: %s)", __func__, snd_device, dev_path);
         audio_route_reset_and_update_path(adev->audio_route, dev_path);
     }
     return 0;

hal/msm8960/platform.c

diff --git a/hal/msm8960/platform.c b/hal/msm8960/platform.c
index d7b7b6b..1a8d0ab 100644
--- a/hal/msm8960/platform.c
+++ b/hal/msm8960/platform.c
@@ -376,7 +376,7 @@
     if (snd_device >= SND_DEVICE_MIN && snd_device < SND_DEVICE_MAX)
         return device_table[snd_device];
     else
-        return "";
+        return "none";
 }
 
 void platform_add_backend_name(void *platform __unused, char *mixer_path,

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 01ab7bb..0d462a1 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -794,7 +794,7 @@
     if (snd_device >= SND_DEVICE_MIN && snd_device < SND_DEVICE_MAX)
         return device_table[snd_device];
     else
-        return "";
+        return "none";
 }
 
 void platform_add_backend_name(void *platform, char *mixer_path,