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

Commit 78b2a922 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Return current song id if active quene item id is not avaliable" am: aba2a8a4 

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



Change-Id: I45b347baf827b149ca9b8f6a357bbe08bcf53144
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cb64b3b6 aba2a8a4

android/app/src/com/android/bluetooth/avrcp/AvrcpTargetService.java

+2 −2
Original line number Diff line number Diff line
@@ -385,10 +385,10 @@ public class AvrcpTargetService extends ProfileService { 


    String getCurrentMediaId() {

        String id = mMediaPlayerList.getCurrentMediaId();

        if (id != null) return id;

        if (id != null && !id.isEmpty()) return id;



        Metadata song = getCurrentSongInfo();

        if (song != null) return song.mediaId;

        if (song != null && !song.mediaId.isEmpty()) return song.mediaId;



        // We always want to return something, the error string just makes debugging easier

        return "error";