commit d034060e1323476c33bdc140f21bb0e37c0e6720
author Zhihai Xu <zhihaixu@google.com> Fri Apr 12 10:38:41 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 12 10:38:41 2013 -0700
tree 6bf4d18ccd9c92ca9361c835e8c88b2b163db2e2
parent 6254387c5a8422a636608cb6e7f77ed1e99bb4b5
parent 79d176b0f3d6cb33c7e52be6641fd4808ba87e93

am 79d176b0: Resolve AVRCP IOP issues

* commit '79d176b0f3d6cb33c7e52be6641fd4808ba87e93':
  Resolve AVRCP IOP issues

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

diff --git a/src/com/android/bluetooth/a2dp/Avrcp.java b/src/com/android/bluetooth/a2dp/Avrcp.java
index 3e3ded1..0a5a69e 100755
--- a/src/com/android/bluetooth/a2dp/Avrcp.java
+++ b/src/com/android/bluetooth/a2dp/Avrcp.java
@@ -93,7 +93,7 @@
         mCurrentPlayState = RemoteControlClient.PLAYSTATE_NONE; // until we get a callback
         mPlayStatusChangedNT = NOTIFICATION_TYPE_CHANGED;
         mTrackChangedNT = NOTIFICATION_TYPE_CHANGED;
-        mTrackNumber = 0L;
+        mTrackNumber = -1L;
         mCurrentPosMs = RemoteControlClient.PLAYBACK_POSITION_INVALID;
         mPlayStartTimeMs = -1L;
         mSongLengthMs = 0L;
@@ -411,8 +411,9 @@
 
     private void sendTrackChangedRsp() {
         byte[] track = new byte[TRACK_ID_SIZE];
+        /* track is stored in big endian format */
         for (int i = 0; i < TRACK_ID_SIZE; ++i) {
-            track[i] = (byte) (mTrackNumber >> (8 * i));
+            track[i] = (byte) (mTrackNumber >> (56 - 8 * i));
         }
         registerNotificationRspTrackChangeNative(mTrackChangedNT, track);
     }
@@ -469,6 +470,7 @@
                 break;
 
             case RemoteControlClient.PLAYSTATE_STOPPED:
+            case RemoteControlClient.PLAYSTATE_NONE:
                 playStatus = PLAYSTATUS_STOPPED;
                 break;
 
@@ -487,7 +489,6 @@
                 break;
 
             case RemoteControlClient.PLAYSTATE_ERROR:
-            case RemoteControlClient.PLAYSTATE_NONE:
                 playStatus = PLAYSTATUS_ERROR;
                 break;