commit c1124a7c6679f612b80926a19084655f9a71580a
author Marie Janssen <jamuraa@google.com> Tue Apr 05 10:49:19 2016 -0700
committer Andre Eisenbach <eisenbach@google.com> Wed Apr 06 20:52:27 2016 +0000
tree 5c7ee304eea1d5b303adf4c43174f82fc95681f4
parent ca4d1610ade1c1e8b871b4abb04b00582049b75d

Enable logging for AVRCP Metadata changes

We're seeing a lot of AVRCP metadata issues, so enable some logging of
metadata in hopes of collecting more information.

Bug: 26837775
Bug: 27153373
Bug: 27178384
Bug: 27745277
Change-Id: Ie425ad2a5e090aa4363dab6b853479eeda35cef6

src/com/android/bluetooth/avrcp/Avrcp.java

diff --git a/src/com/android/bluetooth/avrcp/Avrcp.java b/src/com/android/bluetooth/avrcp/Avrcp.java
index 7d14037..b3b4888 100755
--- a/src/com/android/bluetooth/avrcp/Avrcp.java
+++ b/src/com/android/bluetooth/avrcp/Avrcp.java
@@ -274,6 +274,7 @@
 
         @Override
         public void onClientMetadataUpdate(MetadataEditor metadataEditor) {
+            Log.v(TAG, "RemoteControlDisplayer: Update Metadata");
             Handler handler = mLocalHandler.get();
             if (handler != null) {
                 handler.obtainMessage(MSG_SET_METADATA, 0, 0, metadataEditor).sendToTarget();
@@ -291,19 +292,19 @@
         public void handleMessage(Message msg) {
             switch (msg.what) {
             case MSG_UPDATE_STATE:
-                    updatePlayPauseState(msg.arg2, ((Long) msg.obj).longValue());
+                updatePlayPauseState(msg.arg2, ((Long) msg.obj).longValue());
                 break;
 
             case MSG_SET_METADATA:
-                    updateMetadata((MetadataEditor) msg.obj);
+                updateMetadata((MetadataEditor) msg.obj);
                 break;
 
             case MSG_SET_TRANSPORT_CONTROLS:
-                    updateTransportControls(msg.arg2);
+                updateTransportControls(msg.arg2);
                 break;
 
             case MSG_SET_GENERATION_ID:
-                if (DEBUG) Log.v(TAG, "New genId = " + msg.arg1 + ", clearing = " + msg.arg2);
+                Log.v(TAG, "New genId = " + msg.arg1 + ", clearing = " + msg.arg2);
                 break;
 
             case MESSAGE_GET_RC_FEATURES:
@@ -329,12 +330,11 @@
                 break;
 
             case MESSAGE_GET_ELEM_ATTRS:
-            {
                 String[] textArray;
                 int[] attrIds;
                 byte numAttr = (byte) msg.arg1;
                 ArrayList<Integer> attrList = (ArrayList<Integer>) msg.obj;
-                if (DEBUG) Log.v(TAG, "MESSAGE_GET_ELEM_ATTRS:numAttr=" + numAttr);
+                Log.v(TAG, "MESSAGE_GET_ELEM_ATTRS:numAttr=" + numAttr);
                 attrIds = new int[numAttr];
                 textArray = new String[numAttr];
                 for (int i = 0; i < numAttr; ++i) {
@@ -343,7 +343,7 @@
                 }
                 getElementAttrRspNative(numAttr, attrIds, textArray);
                 break;
-            }
+
             case MESSAGE_REGISTER_NOTIFICATION:
                 if (DEBUG) Log.v(TAG, "MESSAGE_REGISTER_NOTIFICATION:event=" + msg.arg1 +
                                       " param=" + msg.arg2);
@@ -721,6 +721,7 @@
         mMetadata.trackTitle = data.getString(MediaMetadataRetriever.METADATA_KEY_TITLE, null);
         mMetadata.albumTitle = data.getString(MediaMetadataRetriever.METADATA_KEY_ALBUM, null);
         if (!oldMetadata.equals(mMetadata.toString())) {
+            Log.v(TAG, "Metadata Changed to " + mMetadata.toString());
             mTrackNumber++;
             if (mTrackChangedNT == NOTIFICATION_TYPE_INTERIM) {
                 mTrackChangedNT = NOTIFICATION_TYPE_CHANGED;
@@ -740,12 +741,13 @@
                                                      (int)getPlayPosition());
                 mHandler.removeMessages(MESSAGE_PLAY_INTERVAL_TIMEOUT);
             }
+        } else {
+          Log.v(TAG, "Metadata updated but no change!");
         }
-        if (DEBUG) Log.v(TAG, "mMetadata=" + mMetadata.toString());
 
         mSongLengthMs = data.getLong(MediaMetadataRetriever.METADATA_KEY_DURATION,
                 RemoteControlClient.PLAYBACK_POSITION_INVALID);
-        if (DEBUG) Log.v(TAG, "duration=" + mSongLengthMs);
+        Log.v(TAG, "duration=" + mSongLengthMs);
     }
 
     private void getRcFeatures(byte[] address, int features) {
@@ -896,7 +898,7 @@
         if (attrStr == null) {
             attrStr = new String();
         }
-        if (DEBUG) Log.v(TAG, "getAttributeString:attrId=" + attrId + " str=" + attrStr);
+        Log.v(TAG, "getAttributeString:attrId=" + attrId + " str=" + attrStr);
         return attrStr;
     }