commit ec2eeae485e9fbfc62578c461adb59dd4ac4d489
author The Android Automerger <android-build@android.com> Tue Jan 10 06:59:32 2012 -0800
committer The Android Automerger <android-build@android.com> Tue Jan 10 06:59:32 2012 -0800
tree ee799d0d21d283900490b988060d873ff82586af
parent 6934b76075fabbd7a1f542b3000b250f4a589492
parent 67d2aebda525c9e3864dc462a851c482878509dc

merge in ics-release history after reset to master

audio/android_audio_hw.c

diff --git a/audio/android_audio_hw.c b/audio/android_audio_hw.c
index f490232..4a6048b 100644
--- a/audio/android_audio_hw.c
+++ b/audio/android_audio_hw.c
@@ -142,7 +142,7 @@
 {
     struct astream_out *out = (struct astream_out *)stream;
 
-    LOGE("(%s:%d) %s: Implement me!", __FILE__, __LINE__, __func__);
+    ALOGE("(%s:%d) %s: Implement me!", __FILE__, __LINE__, __func__);
     return 0;
 }
 
@@ -167,7 +167,7 @@
 static int out_set_format(struct audio_stream *stream, int format)
 {
     struct astream_out *out = (struct astream_out *)stream;
-    LOGE("(%s:%d) %s: Implement me!", __FILE__, __LINE__, __func__);
+    ALOGE("(%s:%d) %s: Implement me!", __FILE__, __LINE__, __func__);
     return 0;
 }
 
@@ -205,7 +205,7 @@
     /* XXX: shouldn't this use the sample_rate/channel_count from 'out'? */
     ret = a2dp_init(44100, 2, &out->data);
     if (ret < 0) {
-        LOGE("a2dp_init failed err: %d\n", ret);
+        ALOGE("a2dp_init failed err: %d\n", ret);
         out->data = NULL;
         return ret;
     }
@@ -242,9 +242,9 @@
         ret = pthread_cond_timeout_np(&out->write_cond,
                                 &out->lock,
                                 BUF_WRITE_COMPLETION_TIMEOUT_MS);
-        LOGE_IF(ret != 0, "out_standby_stream_locked() wait cond error %d", ret);
+        ALOGE_IF(ret != 0, "out_standby_stream_locked() wait cond error %d", ret);
     }
-    LOGE_IF(attempts == 0, "out_standby_stream_locked() a2dp_write() would not stop!!!");
+    ALOGE_IF(attempts == 0, "out_standby_stream_locked() a2dp_write() would not stop!!!");
 
     ALOGV_IF(!out->bt_enabled, "Standby skip stop: enabled %d", out->bt_enabled);
     if (out->bt_enabled) {
@@ -519,7 +519,7 @@
                 pthread_mutex_unlock(&out->lock);
 
                 if (ret < 0) {
-                    LOGE("%s: a2dp_write failed (%d)\n", __func__, ret);
+                    ALOGE("%s: a2dp_write failed (%d)\n", __func__, ret);
                     /* skip pending frames in case of write error */
                     _out_inc_rd_idx_locked(out, frames);
                     break;
@@ -715,7 +715,7 @@
 
     /* invalid stream? */
     if (!adev->output || adev->output != out) {
-        LOGE("%s: unknown stream %p (ours is %p)", __func__, out, adev->output);
+        ALOGE("%s: unknown stream %p (ours is %p)", __func__, out, adev->output);
         return;
     }
 

audio/liba2dp.c

diff --git a/audio/liba2dp.c b/audio/liba2dp.c
index 40e090c..aba24e4 100755
--- a/audio/liba2dp.c
+++ b/audio/liba2dp.c
@@ -80,7 +80,7 @@
 #define MAX_BITPOOL 64
 #define MIN_BITPOOL 2
 
-#define ERR LOGE
+#define ERR ALOGE
 
 /* Number of packets to buffer in the stream socket */
 #define PACKET_BUFFER_COUNT		10