Bluetooth: Send proper track number

As per specification
RegisterNotification - If no track is currently selected
then return 0xFFFFFFFFFFFFFFFF in the interim response.
Changes are made to ensure return above value if play state
is not playing.

Change-Id: Ib27eeeb65fe6659178658e58eb8f875168b236df
CRs-Fixed: 519337
(cherry picked from commit 5676595caa52f85c369afb9b29119805c63577a9)
(cherry picked from commit b47f4c8a3e7b935cfeda2ebe506e54f903a5ed5e)
(cherry picked from commit f67097224dd89786b58d3d5d62775c15b7d03cd4)

1 files changed, 9 insertions, 1 deletions

diff --git a/src/com/android/bluetooth/a2dp/Avrcp.java b/src/com/android/bluetooth/a2dp/Avrcp.java
index 1e9ac00a2..04af2b5a0 100755
--- a/src/com/android/bluetooth/a2dp/Avrcp.java
+++ b/src/com/android/bluetooth/a2dp/Avrcp.java
@@ -648,9 +648,17 @@ final class Avrcp {
 
     private void sendTrackChangedRsp() {
         byte[] track = new byte[TRACK_ID_SIZE];
+        long TrackNumberRsp = -1L;
+
+        if(DEBUG) Log.v(TAG,"mCurrentPlayState" + mCurrentPlayState );
+        /*As per spec 6.7.2 Register Notification
+          If no track is currently selected, then return
+         0xFFFFFFFFFFFFFFFF in the interim response */
+        if (mCurrentPlayState == RemoteControlClient.PLAYSTATE_PLAYING)
+            TrackNumberRsp = mTrackNumber ;
         /* track is stored in big endian format */
         for (int i = 0; i < TRACK_ID_SIZE; ++i) {
-            track[i] = (byte) (mTrackNumber >> (56 - 8 * i));
+            track[i] = (byte) (TrackNumberRsp >> (56 - 8 * i));
         }
         registerNotificationRspTrackChangeNative(mTrackChangedNT, track);
     }