commit b2902ae9d403d7efdcb6995adf1112ddda7d3ad1
author Jaikumar Ganesh <jaikumar@google.com> Mon Dec 12 15:30:31 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 12 15:30:31 2011 -0800
tree 310b0178a7ed2a2d1f84658ab48f4888b0e714c6
parent 2a8d612473b7f8e6cbc43abc36572eaebcf92047
parent 52c8f9ae61aa01d7c3ebac19d8cbd9e61578bc73

am 52c8f9ae: am a345fd4f: Merge "Fix channel connected signal emission." into ics-mr1

* commit '52c8f9ae61aa01d7c3ebac19d8cbd9e61578bc73':
  Fix channel connected signal emission.

audio/android_audio_hw.c

diff --git a/audio/android_audio_hw.c b/audio/android_audio_hw.c
index 52d6066..74e7212 100644
--- a/audio/android_audio_hw.c
+++ b/audio/android_audio_hw.c
@@ -246,7 +246,7 @@
     }
     LOGE_IF(attempts == 0, "out_standby_stream_locked() a2dp_write() would not stop!!!");
 
-    LOGV_IF(!out->bt_enabled, "Standby skip stop: enabled %d", out->bt_enabled);
+    ALOGV_IF(!out->bt_enabled, "Standby skip stop: enabled %d", out->bt_enabled);
     if (out->bt_enabled) {
         ret = a2dp_stop(out->data);
     }
@@ -260,7 +260,7 @@
     out_standby_stream_locked(out);
 
     if (out->data) {
-        LOGV("%s: calling a2dp_cleanup()", __func__);
+        ALOGV("%s: calling a2dp_cleanup()", __func__);
         a2dp_cleanup(out->data);
         out->data = NULL;
     }
@@ -407,7 +407,7 @@
     pthread_mutex_lock(&out->buf_lock);
     pthread_mutex_lock(&out->lock);
     if (!out->bt_enabled || out->suspended) {
-        LOGV("a2dp write: bluetooth disabled bt_en %d, suspended %d",
+        ALOGV("a2dp %s: bluetooth disabled bt_en %d, suspended %d",
              out->bt_enabled, out->suspended);
         ret = -1;
         goto err_bt_disabled;
@@ -462,7 +462,7 @@
 err_init:
 err_bt_disabled:
     pthread_mutex_unlock(&out->buf_lock);
-    LOGV("!!!! write error");
+    ALOGV("!!!! write error");
     out_standby_stream_locked(out);
     pthread_mutex_unlock(&out->lock);
 
@@ -545,7 +545,7 @@
                 buffer_duration_us = ((ret * 1000) / out->sample_rate) * 1000;
 
                 if (elapsed_us < (buffer_duration_us / 4)) {
-                    LOGV("A2DP sink runs too fast");
+                    ALOGV("A2DP sink runs too fast");
                     usleep(buffer_duration_us - elapsed_us);
                 }
                 out->last_write_time = now;
@@ -610,7 +610,7 @@
 
     /* one output stream at a time */
     if (adev->output) {
-        LOGV("output exists");
+        ALOGV("output exists");
         ret = -EBUSY;
         goto err_output_exists;
     }
@@ -661,7 +661,7 @@
     if (!_out_validate_parms(out, format ? *format : 0,
                              channels ? *channels : 0,
                              sample_rate ? *sample_rate : 0)) {
-        LOGV("invalid parameters");
+        ALOGV("invalid parameters");
         ret = -EINVAL;
         goto err_validate_parms;
     }

audio/liba2dp.c

diff --git a/audio/liba2dp.c b/audio/liba2dp.c
index 62f52d4..9df019f 100755
--- a/audio/liba2dp.c
+++ b/audio/liba2dp.c
@@ -64,7 +64,7 @@
 #endif
 
 #ifdef ENABLE_VERBOSE
-#define VDBG LOGV
+#define VDBG ALOGV
 #else
 #define VDBG(fmt, arg...)
 #endif