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

Commit 887ff06e authored by Jakub Tyszkowski's avatar Jakub Tyszkowski
Browse files

mcp: Provide defaults for the missing metadata 

Makes sure no obsolete values are being left inside the service.

Bug: 150670922
Tag: #feature
Test: compilation
Sponsor: jpawlowski@
Change-Id: Idecb2bbea2453f996e248c2f577f45695a0ea6e7
parent 270eeb3d

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

+14 −11
Original line number Original line Diff line number Diff line
@@ -162,24 +162,27 @@ public class MediaControlProfile implements MediaControlServiceCallbacks { 
                            + mCurrentData.metadata.duration);

                            + mCurrentData.metadata.duration);

                }

                }





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

                state_map.put(PlayerStateField.TRACK_DURATION,

                state_map.put(PlayerStateField.TRACK_DURATION,

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

                        mCurrentData.metadata.duration != null

                }

                                ? Long.valueOf(mCurrentData.metadata.duration)

                                : Long.valueOf(MediaControlGattServiceInterface

                                                       .TRACK_DURATION_UNAVAILABLE));





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

                state_map.put(PlayerStateField.TRACK_TITLE,

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

                        mCurrentData.metadata.title != null ? mCurrentData.metadata.title : "");

                }





                // Update the position if track has changed

                // Update the position if track has changed

                if (mCurrentData.state != null) {

                state_map.put(PlayerStateField.TRACK_POSITION,

                state_map.put(PlayerStateField.TRACK_POSITION,

                            getDriftCorrectedTrackPosition(mCurrentData.state));

                        mCurrentData.state != null

                }

                                ? getDriftCorrectedTrackPosition(mCurrentData.state)

                                : Long.valueOf(MediaControlGattServiceInterface

                                                       .TRACK_POSITION_UNAVAILABLE));

            } else {

            } else {

                state_map.put(PlayerStateField.TRACK_DURATION,

                state_map.put(PlayerStateField.TRACK_DURATION,

                        Long.valueOf(MediaControlGattServiceInterface.TRACK_DURATION_UNAVAILABLE));

                        Long.valueOf(MediaControlGattServiceInterface.TRACK_DURATION_UNAVAILABLE));

                state_map.put(PlayerStateField.TRACK_TITLE, "");

                state_map.put(PlayerStateField.TRACK_TITLE, "");

                state_map.put(PlayerStateField.TRACK_POSITION,

                        Long.valueOf(MediaControlGattServiceInterface.TRACK_POSITION_UNAVAILABLE));

            }

            }

        }

        }