commit a7373c8f031a68a52ce1f876457d1c5c74aaa87f
author Pavlin Radoslavov <pavlin@google.com> Wed May 18 14:30:53 2016 -0700
committer Pavlin Radoslavov <pavlin@google.com> Wed May 18 14:30:53 2016 -0700
tree e2da897e96fb8c3deeb4c333691dc76e2403c74b
parent e34b0eb1110d47832a38180c1b1f8c08205aa0e2

Add error log messages for A2DP commands

Bug: 28823662
Change-Id: Ifa9950dd2277b444bedd5108beff2db029a5ed93

audio_a2dp_hw/audio_a2dp_hw.c

diff --git a/audio_a2dp_hw/audio_a2dp_hw.c b/audio_a2dp_hw/audio_a2dp_hw.c
index a1a8826..4310730 100644
--- a/audio_a2dp_hw/audio_a2dp_hw.c
+++ b/audio_a2dp_hw/audio_a2dp_hw.c
@@ -358,15 +358,19 @@
     }
 
     /* wait for ack byte */
-    if (a2dp_ctrl_receive(common, &ack, 1) < 0)
+    if (a2dp_ctrl_receive(common, &ack, 1) < 0) {
+        ERROR("A2DP COMMAND %s: no ACK", dump_a2dp_ctrl_event(cmd));
         return -1;
+    }
 
     DEBUG("A2DP COMMAND %s DONE STATUS %d", dump_a2dp_ctrl_event(cmd), ack);
 
     if (ack == A2DP_CTRL_ACK_INCALL_FAILURE)
         return ack;
-    if (ack != A2DP_CTRL_ACK_SUCCESS)
+    if (ack != A2DP_CTRL_ACK_SUCCESS) {
+        ERROR("A2DP COMMAND %s error %d", dump_a2dp_ctrl_event(cmd), ack);
         return -1;
+    }
 
     return 0;
 }

btif/src/btif_media_task.cc

diff --git a/btif/src/btif_media_task.cc b/btif/src/btif_media_task.cc
index c625ec8..76b23e0 100644
--- a/btif/src/btif_media_task.cc
+++ b/btif/src/btif_media_task.cc
@@ -558,6 +558,8 @@
 
             if (media_task_running == MEDIA_TASK_STATE_SHUTTING_DOWN)
             {
+                APPL_TRACE_WARNING("%s: A2DP command %s while media task shutting down",
+                                   __func__, dump_a2dp_ctrl_event(cmd));
                 a2dp_cmd_acknowledge(A2DP_CTRL_ACK_FAILURE);
                 return;
             }
@@ -569,6 +571,8 @@
             }
             else
             {
+                APPL_TRACE_WARNING("%s: A2DP command %s while AV stream is not ready",
+                                   __func__, dump_a2dp_ctrl_event(cmd));
                 a2dp_cmd_acknowledge(A2DP_CTRL_ACK_FAILURE);
             }
             break;
@@ -585,8 +589,8 @@
 
             if (alarm_is_scheduled(btif_media_cb.media_alarm))
             {
-                APPL_TRACE_WARNING("%s Unexpected HAL start."
-                   "Stream already in started state", __func__);
+                APPL_TRACE_WARNING("%s: A2DP command %s when media alarm already scheduled",
+                                   __func__, dump_a2dp_ctrl_event(cmd));
                 a2dp_cmd_acknowledge(A2DP_CTRL_ACK_FAILURE);
                 break;
             }
@@ -614,6 +618,8 @@
             }
             else
             {
+                APPL_TRACE_WARNING("%s: A2DP command %s while AV stream is not ready",
+                                   __func__, dump_a2dp_ctrl_event(cmd));
                 a2dp_cmd_acknowledge(A2DP_CTRL_ACK_FAILURE);
                 break;
             }
@@ -1097,6 +1103,8 @@
     }
     else if (pending_start)
     {
+        APPL_TRACE_WARNING("%s: A2DP start request failed: status = %d",
+                         __func__, p_av->status);
         a2dp_cmd_acknowledge(A2DP_CTRL_ACK_FAILURE);
         ack = TRUE;
     }
@@ -1151,8 +1159,11 @@
         {
             APPL_TRACE_EVENT("AV STOP FAILED (%d)", p_av->status);
 
-            if (p_av->initiator)
+            if (p_av->initiator) {
+                APPL_TRACE_WARNING("%s: A2DP stop request failed: status = %d",
+                                   __func__, p_av->status);
                 a2dp_cmd_acknowledge(A2DP_CTRL_ACK_FAILURE);
+            }
             return;
         }
     }
@@ -1195,8 +1206,11 @@
     /* check for status failures */
     if (p_av->status != BTA_AV_SUCCESS)
     {
-        if (p_av->initiator == TRUE)
+        if (p_av->initiator == TRUE) {
+            APPL_TRACE_WARNING("%s: A2DP suspend request failed: status = %d",
+                               __func__, p_av->status);
             a2dp_cmd_acknowledge(A2DP_CTRL_ACK_FAILURE);
+        }
     }
 
     /* once stream is fully stopped we will ack back */
@@ -1233,7 +1247,7 @@
             ack = A2DP_CTRL_ACK_UNSUPPORTED;
             break;
         default:
-            APPL_TRACE_ERROR("%s FAILED", __func__);
+            APPL_TRACE_ERROR("%s FAILED: status = %d", __func__, status);
             ack = A2DP_CTRL_ACK_FAILURE;
             break;
     }