Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3389bda authored by Sumit Bajpai's avatar Sumit Bajpai Committed by Linux Build Service Account
Browse files

Fix AVRCP crash, position and state tracking 

When the MediaController goes away (media stops) a NPE would cause a
crash.

Initialize the position so that an initial notification gets sent
when position is requested, send it when the music is paused, and
send play state whenever the app sends us a play state update.

Change-Id: Id5ffe1be8acf1579f93eab8ee1797d14000b9964
parent 5f4a7505

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

+20 −11
Original line number Diff line number Diff line
@@ -310,6 +310,8 @@ public final class Avrcp { 
            mPlayStatusChangedNT = NOTIFICATION_TYPE_CHANGED;

            mPlayerStatusChangeNT = NOTIFICATION_TYPE_CHANGED;

            mTrackChangedNT = NOTIFICATION_TYPE_CHANGED;

            mNextPosMs = -1;

            mPrevPosMs = -1;

            mPlaybackIntervalMs = 0L;

            mPlayPosChangedNT = NOTIFICATION_TYPE_CHANGED;

            mFeatures = 0;
@@ -883,12 +885,10 @@ public final class Avrcp { 
        mMediaController = controller;

        if (mMediaController == null) {

            updateMetadata(null);

            updatePlaybackState(null, null);

            return;

        }

        mMediaController.registerCallback(mMediaControllerCb, mHandler);

        updateMetadata(mMediaController.getMetadata());

        updatePlaybackState(mMediaController.getPlaybackState(), null);

        if (mHandler != null) {

            Log.v(TAG, "Focus gained for player: " + mMediaController.getPackageName());

            mHandler.obtainMessage(MSG_UPDATE_RCC_CHANGE, 1, 1,
@@ -1688,18 +1688,13 @@ public final class Avrcp { 
        }

        Log.i(TAG,"updatePlayStatusForDevice: device: " +

                    deviceFeatures[deviceIndex].mCurrentDevice);

        int oldPlayStatus = convertPlayStateToPlayStatus(

                    deviceFeatures[deviceIndex].mCurrentPlayState);

        int newPlayStatus = convertPlayStateToPlayStatus(state);

        if (DEBUG)

            Log.v(TAG, "oldPlayStatus " + oldPlayStatus);

        if (DEBUG)

            Log.v(TAG, "newPlayStatus " + newPlayStatus);



        deviceFeatures[deviceIndex].mCurrentPlayState = state;



        if ((deviceFeatures[deviceIndex].mPlayStatusChangedNT ==

                NOTIFICATION_TYPE_INTERIM) && (oldPlayStatus != newPlayStatus)) {

        if ((deviceFeatures[deviceIndex].mPlayStatusChangedNT == NOTIFICATION_TYPE_INTERIM)) {

            deviceFeatures[deviceIndex].mPlayStatusChangedNT = NOTIFICATION_TYPE_CHANGED;

            registerNotificationRspPlayStatusNative(

                    deviceFeatures[deviceIndex].mPlayStatusChangedNT,
@@ -2282,8 +2277,13 @@ public final class Avrcp { 
        }

        if (!oldAttributes.equals(mMediaAttributes)) {

            Log.v(TAG, "MediaAttributes Changed to " + mMediaAttributes.toString());

            // Update the play state, which sends a notification if needed.

            // Update the play state, which sends play state and play position

            // notification if needed.

            if (mMediaController != null) {

                updatePlaybackState(mMediaController.getPlaybackState(), null);

            } else {

                updatePlaybackState(null, null);

            }

            for (int i = 0; i < maxAvrcpConnections; i++) {

                if ((deviceFeatures[i].mCurrentDevice != null) &&

                    (deviceFeatures[i].mTrackChangedNT == NOTIFICATION_TYPE_INTERIM)) {
@@ -4601,25 +4601,34 @@ public final class Avrcp { 
                Log.e(TAG,"Device index is not valid in getPlayPosition");

                return -1L;

            }



            if (deviceFeatures[deviceIndex].mCurrentPlayState == null)

                return -1L;



            if (deviceFeatures[deviceIndex].mCurrentPlayState.getPosition() ==

                    PlaybackState.PLAYBACK_POSITION_UNKNOWN) {

                return -1L;

            }



            if (isPlayingState(deviceFeatures[deviceIndex].mCurrentPlayState))

                return SystemClock.elapsedRealtime() - mLastStateUpdate +

                       deviceFeatures[deviceIndex].mCurrentPlayState.getPosition();



            return deviceFeatures[deviceIndex].mCurrentPlayState.getPosition();



        } else {

            if (mCurrentPlayerState == null)

                return -1L;



            if (mCurrentPlayerState.getPosition() == PlaybackState.PLAYBACK_POSITION_UNKNOWN)

                return -1L;



            if (isPlayingState(mCurrentPlayerState))

                return SystemClock.elapsedRealtime() - mLastStateUpdate +

                       mCurrentPlayerState.getPosition();



            return mCurrentPlayerState.getPosition();

        }

        return -1L;

    }



    private String getAttributeStringFromCursor(Cursor cursor, int attrId, int deviceIndex) {