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

Commit d4871e81 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Automerger Merge Worker
Browse files

Merge "mcp: Fix handling incomplete metadata" am: 270eeb3d 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1814598

Change-Id: Ic66ac918c997a90fa8d6ae3f0aa230ee23182471
parents c615f2dc 270eeb3d

android/app/src/com/android/bluetooth/mcp/MediaControlProfile.java

+12 −4
Original line number Diff line number Diff line
@@ -126,7 +126,10 @@ public class MediaControlProfile implements MediaControlServiceCallbacks { 
        Map<PlayerStateField, Object> state_map = new HashMap<>();



        if (mMediaPlayerList.getActivePlayer() != mLastActivePlayer) {

            state_map.put(PlayerStateField.PLAYER_NAME, getCurrentPlayerName());

            String playerName = getCurrentPlayerName();

            if (playerName != null) {

                state_map.put(PlayerStateField.PLAYER_NAME, playerName);

            }

        }



        if (stateChanged) {
@@ -159,9 +162,14 @@ public class MediaControlProfile implements MediaControlServiceCallbacks { 
                            + mCurrentData.metadata.duration);

                }



                if (mCurrentData.metadata.duration != null) {

                    state_map.put(PlayerStateField.TRACK_DURATION,

                            Long.valueOf(mCurrentData.metadata.duration));

                }



                if (mCurrentData.metadata.title != null) {

                    state_map.put(PlayerStateField.TRACK_TITLE, mCurrentData.metadata.title);

                }



                // Update the position if track has changed

                if (mCurrentData.state != null) {